Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,986 Commits 3 Branches 0 Tags 1 GiB
cb495fb33b
Commit Graph

20986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +05:30
Nabin Hait
4702cc0368 Merge branch 'hotfix' 2018-01-05 13:16:59 +05:30
Nabin Hait
c98cfbdab4 bumped to version 10.0.6 2018-01-05 13:46:59 +06:00
Nabin Hait
28d0230e56 Multiple small fixes 2018-01-05 13:14:25 +05:30
James Robertson
46196c4ad3 Setup Wizard Updates (#12337) 
Changes to support v10 ERPNext Setup Wizard
 2018-01-05 12:50:04 +05:30
Saurabh
eac2e369cf [fix] setup alias for ifnull condition (#12327) 2018-01-05 12:48:08 +05:30
Doridel Cahanap
291b26ad04 Training Documentation in DE (#12309) 2018-01-05 12:47:40 +05:30
Manas Solanki
a521efc990 fix for the non stock items for the shopping cart (#12294) 2018-01-05 12:47:20 +05:30
tundebabzy
8f44d1c63d Payment Terms in Delivery Note #12167 (#12293) 
* add Payment Terms Template field to delivery note:
- This helps for users who create invoice from Sales Invoice
- Field is hidden in print
- Field is not coupled to Payment Schedule table.

* do nothing in payment_terms_template trigger if doctype is Delivery Note
 2018-01-05 12:46:50 +05:30
Shreya Shah
48351e0339 cancelled sales invoice totals shouldn't be reflected in leaderboard for customer (#12292) 2018-01-05 12:45:43 +05:30
Manas Solanki
171157f1b3 Fix + Enhancement in Program Enrollment Tool (#12291) 
* Fix + Enhancement in Program Enrollment Tool

* updated the docs
 2018-01-05 12:42:39 +05:30
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290) 
* Companywise default tax template

* Fix test cases
 2018-01-05 12:42:02 +05:30
rohitwaghchaure
3f784a7a49 [minor] POS profile mandatory, to set as default (#12307) 2018-01-05 12:26:33 +05:30
rohitwaghchaure
1f39feb12f [Fix] PO -> PI non default taxes not fetched (#12313) 2018-01-05 12:25:45 +05:30
rohitwaghchaure
c5c6f82623 [Hotfix] Tax rate not showing in the report (#12324) 2018-01-05 12:16:16 +05:30
Nabin Hait
42688f0636 Minor fix 2018-01-04 18:12:21 +05:30
Nabin Hait
941d0af13a Fixed organization lead error 2018-01-03 14:12:56 +05:30
Nabin Hait
76625b359e Removed naming series from set_only_once in pos profile 2018-01-03 14:03:53 +05:30
Manas Solanki
76ea7a9227
Merge pull request #12301 from kennethsequeira/cust-report-vid 
Updated youtube video link for custom reports article
 2018-01-02 21:53:47 +05:30
Kenneth Sequeira
82bd3302ee updated youtube video link for custom reports article 2018-01-02 21:41:48 +05:30
Saurabh
e9b37abfca Merge branch 'hotfix' 2018-01-02 12:09:25 +05:30
Saurabh
14506d7878 Merge branch 'master' into develop 2018-01-02 12:09:25 +05:30
Saurabh
abf5fa6bbb bumped to version 10.0.5 2018-01-02 12:39:25 +06:00
tundebabzy
650a1eeede recalculate terms when document date changed (#12288) 
* recalculate terms when document date changed

* clean up
 2018-01-02 12:02:30 +05:30
Nabin Hait
96b264b314 Minor fixes 2018-01-02 11:50:29 +05:30
Manas Solanki
15b880154a
Merge pull request #12283 from kennethsequeira/cust-doc-img 
Updated the image paths for Custom Doctype manual
 2018-01-01 20:16:01 +05:30
Kenneth Sequeira
13e5689bd9 Updated the image paths for Custom Doctype manual 2018-01-01 17:33:57 +05:30
Saurabh
2ac1835f7d [fix] if is_root is true make parent account empty (#12255) 2018-01-01 16:17:43 +05:30
Saurabh
15d53c7912 [fix] key error (#12257) 2018-01-01 16:17:14 +05:30
Saurabh
9579645ae1 [fix] if item code exists then only call get_item_details (#12258) 2018-01-01 16:17:02 +05:30
Saurabh
a6b41e855b [fix] check if null for mode of payments (#12264) 2018-01-01 16:16:50 +05:30
rohitwaghchaure
526b0bc4e9 [minor] Code cleanup (#12278) 2018-01-01 16:16:16 +05:30
rohitwaghchaure
2640c7eec5 [Fix] Validation issue for online POS profile (#12276) 2018-01-01 16:15:41 +05:30
Nabin Hait
c33788a91b Show standard rate only in unsaved Item 2017-12-29 15:42:50 +05:30
Jamsheer
c90195de29 Patient medical record and Consulatation (#12198) 
* Patient Medical Record - Subject field reqd=0, Subject text formated

* Consultation - remove patient details section

* Search fields are updated for Consultation and Appointment

* Translations applied on menu
 2017-12-29 14:32:13 +05:30
Javier Wong
2469095a13 Check Meta before Toggling Conversion Factor (#12237) 
If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.
 2017-12-29 14:06:47 +05:30
Shreya Shah
df0dd8be5f Travis fix for client side tests (#12224) 
* salary slip test fix

* attendance tool test fix

* timeout after routing
 2017-12-29 14:04:46 +05:30
Nabin Hait
ddd5bf736b Merge branch 'master' into develop 2017-12-28 18:46:52 +05:30
Nabin Hait
da82674b47 Merge branch 'hotfix' 2017-12-28 18:46:51 +05:30
Nabin Hait
07be33805d bumped to version 10.0.4 2017-12-28 19:16:51 +06:00
rohitwaghchaure
a84d38999c [Fix] Sales order erased on production order on selection of sales order (#12225) 2017-12-28 18:45:27 +05:30
rohitwaghchaure
c9ed09440c Re-execute uae vat patch (#12230) 2017-12-28 18:42:22 +05:30
rohitwaghchaure
fe22686a8f Update last purchase rate from the purchase invoice (#12189) 2017-12-28 16:11:27 +05:30
Nabin Hait
b820174b18 Merge branch 'master' into develop 2017-12-28 14:22:59 +05:30
Nabin Hait
31d7433946 Merge branch 'hotfix' 2017-12-28 14:22:58 +05:30
Nabin Hait
c70a78dcf6 bumped to version 10.0.3 2017-12-28 14:52:57 +06:00
rohitwaghchaure
d45266881a [Enhance] New print format for UAE/KSA for vat/excise (#12202) 
* [Enhance] New print format for UAE/KSA for vat/excise

* Fixed spelling
 2017-12-28 14:20:13 +05:30
rohitwaghchaure
dbb5ae9a9e [fix] Closing balance showing at wrong side (#12220) 2017-12-28 13:15:21 +05:30
Nabin Hait
ca674bec42
Set numeric ranges in Item tamplate if blank (#12199) 2017-12-28 12:35:11 +05:30
Saurabh
28ce1c0c3a [fix] add flag ignore mandatory (#12201) 2017-12-28 12:34:58 +05:30