Commit Graph

20011 Commits

Author SHA1 Message Date
tunde
d348c12bdb fix sales order ui test 2017-09-28 09:46:31 +01:00
tunde
567119170e Merge branch 'develop' into payment-terms 2017-09-26 17:28:07 +01:00
Frappe PR Bot
9aff73d156 [Translation] Updated Translations (#10901) 2017-09-26 17:18:42 +05:30
Nabin Hait
51a07d19c8 Merge branch 'master' into develop 2017-09-26 15:59:15 +05:30
Nabin Hait
8ff0a64ac2 Merge branch 'staging' 2017-09-26 15:59:12 +05:30
Nabin Hait
c0b4f0e81b bumped to version 9.0.0 2017-09-26 16:29:12 +06:00
Nabin Hait
b0ba55e52f Set bill no while making payment entry from purchase invoice 2017-09-26 15:56:58 +05:30
tunde
79f9a4aef1 bug fix: sales invoice always dirty even after reloading 2017-09-26 10:39:30 +01:00
tunde
095cfc9cfc disable some Payment Schedule fields 2017-09-26 10:25:49 +01:00
tunde
9e4dcdfbc8 rename Payment Terms Schedule section break to Payment Terms 2017-09-26 09:44:23 +01:00
rohitwaghchaure
d4c2d77bba [fix] POS not working if user clicks on back button from form view (#10912) 2017-09-26 13:27:06 +05:30
Prateeksha Singh
ada8ba96b3 [setup] remove translations from action name (#10911) 2017-09-26 13:07:24 +05:30
Nabin Hait
773e686fb1 change log for version 9 2017-09-26 12:41:43 +05:30
tunde
192587fe56 UI test cases 2017-09-26 01:32:08 +01:00
tunde
c4b0d17c08 fix bug: can't make PE for invoice with multi due date 2017-09-26 01:02:43 +01:00
tunde
31ddbe36c0 fix bug: cast to flt 2017-09-25 23:24:32 +01:00
tunde
541d3f9567 fix ui tests 2017-09-25 18:15:47 +01:00
tunde
cd9bc6f795 fix failing test 2017-09-25 14:51:21 +01:00
tunde
94c3c13ba6 fix failing tests 2017-09-25 14:47:48 +01:00
Nabin Hait
afe9eabd3c Merge branch 'master' into develop 2017-09-25 16:36:47 +05:30
Nabin Hait
360c1efd18 Merge branch 'master' into staging 2017-09-25 16:36:47 +05:30
Nabin Hait
a0b85cd1ec Merge branch 'hotfix' 2017-09-25 16:36:45 +05:30
Nabin Hait
9ef023b10f bumped to version 8.11.6 2017-09-25 17:06:44 +06:00
Nabin Hait
0d0811ca14 reload print style 2017-09-25 16:33:45 +05:30
Nabin Hait
39c2f75e6d Merge branch 'master' into staging 2017-09-25 16:03:32 +05:30
Nabin Hait
cb5e1e550f Merge branch 'master' into develop 2017-09-25 16:03:31 +05:30
Nabin Hait
3ab938ea34 Merge branch 'hotfix' 2017-09-25 16:03:29 +05:30
Nabin Hait
7da3c46ef2 bumped to version 8.11.5 2017-09-25 16:33:29 +06:00
tunde
90e09d4e79 fix failing tests from shopping cart 2017-09-25 11:27:32 +01:00
tunde
8a53b64ac4 Merge branch 'develop' into payment-terms 2017-09-25 10:31:42 +01:00
tunde
9bed2de726 show all duplicate rows after checking for duplicate due date 2017-09-25 10:19:35 +01:00
tunde
e52bb825ec fix bug: form is always dirty 2017-09-25 09:02:23 +01:00
Nabin Hait
3b61552836 Revert "Advance against expense claim (#10632)" (#10877)
This reverts commit cdd6ded790.
2017-09-25 11:27:39 +05:30
Nabin Hait
4ebac3380d reload print style 2017-09-23 15:50:39 +05:30
tunde
77ecacc379 validation to check for possible duplicate payment terms 2017-09-22 23:12:55 +01:00
tunde
cf42d1db5c more tests 2017-09-22 17:20:33 +01:00
tunde
3aec78b472 make due date, invoice_portion mandatory 2017-09-22 16:22:15 +01:00
tunde
e6b3fe1215 add tests for payment term template 2017-09-22 16:04:07 +01:00
tunde
d6cf6fb124 documentation for payment terms 2017-09-22 15:49:02 +01:00
tunde
62af5c5693 more validation checks and test fixes 2017-09-22 15:16:38 +01:00
tunde
73a83a472d validation for Payment Terms Template 2017-09-22 11:05:40 +01:00
tunde
25cda29007 fix test Employee 2017-09-21 14:33:39 +01:00
tundebabzy
e4be3f8dc9 use generator when updating and notify user of long process (#10777) 2017-09-21 18:27:33 +05:30
tunde
d7d306bfdb fix final failing test 2017-09-21 13:43:38 +01:00
Nabin Hait
cdd6ded790 Advance against expense claim (#10632)
* Adds Whitelist Method for Advance Entry

* Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date

* Adds changes for managing advance payments using Default Account and Party

* Removed console.log from the JS file

* Advance Payment Patch - Fixed Codacy errors

* Removed stray file

* Fixed conflicts due to changes in upstream

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed Codacy errors

* Fixed pending Codacy error

* Updated JS code by removing cur_frm which is soon to be deprecated

* Advance against Expense Claim: cleanup and fixes

* Test case fixed
2017-09-21 18:03:45 +05:30
Nabin Hait
3d5d858933 set total in tax table if category not valuation and consider deductions (#10870) 2017-09-21 16:15:30 +05:30
Nabin Hait
fb142f5283 Merge branch 'AravindPranera-develop' into develop 2017-09-21 15:52:06 +05:30
Nabin Hait
6d78f7b862 Fixed indentation 2017-09-21 15:51:42 +05:30
tunde
82de375ba0 Merge branch 'develop' into payment-terms 2017-09-21 11:21:05 +01:00
Nabin Hait
5478a7fa67 Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop 2017-09-21 15:48:18 +05:30