schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,343 Commits 322 Branches 1,581 Tags
2a58b6c20b0e8960419206a99a0317dd6af660b7
Commit Graph

334 Commits

Author SHA1 Message Date
Mangesh-Khairnar
de3b79cce8 fix: precision on comparing with the outstanding amount (#18374) 2019-07-18 13:51:05 +05:30
Nabin Hait
ad99934b4c Update accounts_controller.py 2019-07-01 15:16:10 +05:30
deepeshgarg007
069276473f fix: Division by zero error fix in group similar item 2019-06-24 17:46:44 +05:30
Nabin Hait
afd9e7546f Merge branch 'hotfix' into bugfix/17547-Pricing-Rules-are-broken 2019-05-27 19:22:34 +05:30
Nabin Hait
79dd4d707b fix: Error fixed due to merging of lead/customer to party_name 2019-05-27 15:44:12 +05:30
Nabin Hait
7a6b88c791 fix: payment reconciliation against expense claim (#17728) 
* feat: Added dashboard in expense claim

* fix: payment reconciliation against expense claim
 2019-05-27 11:41:05 +05:30
Mohammad Noureldin
8908d4ee8f 17547: 
- Filling in 'customer' arg field if not already set and if 'party_name' is available
- This will fix the logic during which Pricing Rule is constructing the SQL query to list all Pricing Rules related to an item
- The reason to put it in accounts_controller is:
-# This is the palce when args are made before making call which will end using Pricing Rule logic, which means we don't have to go all over the place to add the proper arg field
-# IMHO, it is clean enough in contrast to the case where that code is added to pricing_rule.py for example, cause doing this exposes Pricing Rule to the knowledge about a field called 'party_name' while a Pricing Rule document doesn't have any
 2019-05-09 18:21:32 +02:00
Rohit Waghchaure
dac7ede911 fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount 2019-05-09 19:50:00 +05:30
Nabin Hait
619bf561da fix: Don't allocate advance if pos 2019-04-25 17:47:26 +05:30
Nabin Hait
05fb3f2d75 fix: don't allocate advances if POS 2019-04-23 15:49:38 +05:30
Nabin Hait
97bf12734a fix: Pull items from PR to PI 2019-04-16 22:11:22 +05:30
Nabin Hait
a8c8e6b78a Merge pull request #16752 from nabinhait/limit-cond-fix 
fix: Limit conditions while fetching payment entries
 2019-04-15 10:19:12 +05:30
Nabin Hait
ea4c2c9e7d fix: task optimisation and test case fixes 2019-04-12 11:33:28 +05:30
Nabin Hait
760b01912a Merge branch 'hotfix' into limit-cond-fix 2019-04-11 11:47:48 +05:30
Anurag Mishra
76815cf2be fix: removed before from accounts_controlle.pyr and fetch the gl from frontend 2019-04-06 12:07:40 +05:30
Suraj Shetty
a7992ecb62 style: Fix formatting 2019-03-27 20:32:42 +05:30
Suraj Shetty
abc2a64d5e fix: Commonify get gl_entry code by moving it to accounts_controller 2019-03-27 20:25:18 +05:30
Nabin Hait
e7cc6649eb fix: Limit conditions while fetching payment entries 2019-02-21 17:23:23 +05:30
rohitwaghchaure
c18e925d61 fix: Moved regional methods from controller to hooks (#16736) 2019-02-20 17:13:15 +05:30
Gaurav
f1e28e0e8d mod(regional,italy): Updates to Italian Localization 
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
 2019-02-19 10:39:22 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
Nabin Hait
d2e2ca31ac Merge pull request #16460 from nabinhait/pricing-rule-issue 
fix: Enforce pricing rule based on rate on server side
 2019-01-23 12:09:12 +05:30
Nabin Hait
da32916396 fix: Enforce pricing rule based on rate on server side 2019-01-22 19:06:06 +05:30
Rohit Waghchaure
f725816809 Enhance: Added field limit in the Payment Reconciliation to handle large entries 2019-01-17 12:54:14 +05:30
Nabin Hait
bf0b6fd8a9 Merge pull request #16342 from finbyz/staging-fixes 
fix: rounded total if available while caclulating advance paid
 2019-01-08 20:29:32 +05:30
Sagar Vora
f733a39089 fix: remove trailing whitespace 2019-01-07 14:24:01 +05:30
finbyz
5efc7973ea Minor Fix for Rounded Total 2019-01-05 11:12:11 +05:30
deepeshgarg007
77cde832d6 Added validation for update items in purchase order as well 2018-12-27 15:56:51 +05:30
deepeshgarg007
ffb411d9e2 Validation while updating items in sales order 2018-12-27 14:12:05 +05:30
Rohit Waghchaure
f6f503a1f6 [Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice 2018-12-19 15:15:35 +05:30
Nabin Hait
e4cc062cf1 Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total 
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
 2018-11-27 13:22:50 +05:30
Nabin Hait
72fc1b57be Merge pull request #16083 from Anurag810/new-fix-branch 
[fix] delivery note with quantity equal 0 #14211
 2018-11-27 13:10:31 +05:30
Rohit Waghchaure
6cc2f52fa4 [Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice 2018-11-27 12:07:03 +05:30
Rohit Waghchaure
d1a85a3637 [Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice 2018-11-26 18:42:29 +05:30
Anurag Mishra
e657fe84b8 making validation generic for sales order,sales invoice,purchase order etc. 2018-11-26 17:13:10 +05:30
Zarrar
5be6d19f4d [Minor] Display Discount Amount when Tax table is empty (#15812) 
* show discount amount even when tax table is empty

* negate the value for discount while printing
 2018-11-08 12:16:26 +05:30
Shreya Shah
785f1aa96d fix(print): Update idx if grouping same items (#15647) 2018-10-11 10:14:25 +05:30
Faris Ansari
2ab6e0e39b fix(translations): Replace translations by keyword with indexed version (#15426) 
* fix(translations): Replace translations by keyword with indexed version

Keywords in the translation also gets translated which
results in an error because python cannot find the key

* Update buying_controller.py
 2018-09-19 13:13:59 +05:30
Nabin Hait
6a5695fe17 minor fix 2018-08-09 11:30:21 +05:30
Nabin Hait
9a33bc6417 optimizing transactions by caching 2018-08-09 10:47:09 +05:30
Nabin Hait
50238c3049 [optimize] tree conditions for pricing rule 2018-08-08 18:43:04 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
Nabin Hait
041a5c2d3b Get Advances and auto allocate (#14970) 2018-08-01 18:07:39 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
rohitwaghchaure
3ffe89659a [Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879) 2018-07-13 17:40:48 +05:30
Nabin Hait
b2da082798 Fixed logic and tests 2018-07-13 17:02:08 +05:30
Doridel Cahanap
6f06cc27e6 Update Qty and Rate in PO and SO 2018-07-13 17:02:08 +05:30
Alchez
9155e40bc7 [Fix] Set default CF in case none exist (#14829) 2018-07-09 16:57:42 +05:30
Alchez
8f2a0f3d79 [Fix] Incorrect assignment of Serial No in POS Invoice (#14772) 
* Fix incorrect assignment of serial no in Sales Invoice through POS

* Add conversion factor to quantity check
 2018-07-06 14:36:52 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30