1. 19 Dec, 2017 10 commits
  2. 18 Dec, 2017 1 commit
  3. 14 Dec, 2017 1 commit
  4. 13 Dec, 2017 1 commit
  5. 11 Dec, 2017 1 commit
    • Prajkta Patkar's avatar
      Merge branch 'consignee' into 'devel' · d4632682
      Prajkta Patkar authored
      Consignee  Details in Delivery Note
      
      1. 'consignee' field is added in delchal table of type JSONB.
      
      2. changes in api_organisation.py for consignee field in delchal table.
      
      3. changes in getdelchal function for consignee(i.e. "consignee":delchaldata["consignee"]).
      
      closes #364
      
      See merge request !23
      d4632682
  6. 06 Dec, 2017 5 commits
  7. 04 Dec, 2017 4 commits
  8. 02 Dec, 2017 1 commit
  9. 01 Dec, 2017 4 commits
  10. 30 Nov, 2017 1 commit
    • Prajkta Patkar's avatar
      Merge branch 'transnote' into 'devel' · 713b8e50
      Prajkta Patkar authored
      List of Godown in Transfer Note
      
      "getGodownProd" function  is written for 'Dispatched From',  it will return Godown Name with Address containing products.
      
      closes #362
      
      See merge request !20
      713b8e50
  11. 27 Nov, 2017 1 commit
  12. 17 Nov, 2017 2 commits
  13. 11 Nov, 2017 2 commits
    • Krishnakant Mane's avatar
      Merge branch 'devel' into 'master' · 814126b7
      Krishnakant Mane authored
      Merge branch Devel to master
      
      See merge request !18
      814126b7
    • Krishnakant Mane's avatar
      Merge branch 'InvTax' into 'devel' · b0b81bbd
      Krishnakant Mane authored
      Change metho to calculate Tax
      
      We are using CalTax function which finds tax of a product currently stored in the database, which is incorrect in the scenario when tax changes oftenly. 
      In view single invoice tax calculation method modified, where tax retrieves from invoice row  iteself.
      
      See merge request !17
      b0b81bbd
  14. 10 Nov, 2017 6 commits