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

13179 Commits

Author SHA1 Message Date
joezsweet
1be684fd87
codici fix 2018-01-11 09:03:26 +01:00
joezsweet
b6fb8d2143
fix patch, reload doc 2018-01-11 08:44:59 +01:00
joezsweet
9116666288
fix patch 2018-01-10 23:11:13 +01:00
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode 2018-01-10 21:49:27 +01:00
Nabin Hait
619c42b934
GSTR1 for B2B (#12296) 2018-01-10 17:48:03 +05:30
Vishal Dhayagude
0099a09e9b [fix] fix print hide weight details in quotation print format (#12412) 2018-01-10 16:30:09 +05:30
Zarrar
94f9f48d70 set from_warehouse only if purchase_order and purpose found (#12398) 2018-01-10 16:29:40 +05:30
Nabin Hait
687dc6a424 patch fixed 2018-01-10 14:51:19 +05:30
frappe-pr-bot
a20ef08ebf [Translation] Updated Translations 2018-01-09 13:29:17 +02:00
Pawan Mehta
d0e7367525 [fix] #12390 (#12391) 2018-01-09 14:33:25 +05:30
Saurabh
892a7a6980 resolved merge conflicts 2018-01-09 12:05:20 +05:30
Saurabh
0b3b63a9af bumped to version 10.0.7 2018-01-09 12:25:38 +06:00
rohitwaghchaure
412e044e8f [Fix] Error in stock move from batch dashboard (#12377) 2018-01-09 11:27:35 +05:30
Zarrar
0f458b1260 show balance if permitted to view gl entry (#12385) 2018-01-09 11:27:14 +05:30
tundebabzy
da22167741 Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382) 
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.

* ui test cases

* cleanup
 2018-01-09 10:58:44 +05:30
Vishal Dhayagude
d2d54826ab [minor] Minor Changes in Membership Doctype (#12384) 2018-01-09 10:56:17 +05:30
Pawan Mehta
5b069a4e25 Added Payment Details to Sales Payment Summary Report (#12358) 
* [fix] #12357

* label changes
 2018-01-09 10:53:13 +05:30
Sachin Mane
64f48db406 Batch number selector bug fix (#12346) 
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"
 2018-01-08 17:57:32 +05:30
Prateeksha Singh
8b94f1b553 [minor][buying] fix schedule date check (#12375) 2018-01-08 16:46:39 +05:30
rohitwaghchaure
7fcc21bc8b [Fix] Cart remain same even if pos profile change (#12371) 2018-01-08 15:22:22 +05:30
rohitwaghchaure
bf4c114c58 [Enhance] Provision to show inclusive tax in print (#12345) 
* [Enhance] Provision to show inclusive tax in print

* POS Print format
 2018-01-08 15:20:15 +05:30
Shreya Shah
44fa9a6d9d Last purchase rate button added back (#12135) 
* last purchase rate button added

* triggers to update rate on button

* updated modified column in buying settings

* moved trigger to get_item_details.py

* hide get_last_rate button depending on buying settings
 2018-01-08 14:58:20 +05:30
Prateeksha Singh
50b6d79758
Merge pull request #12370 from Zlash65/fix-root-node-delete 
[Fix] Delete root node for account
 2018-01-08 12:51:31 +05:30
Nabin Hait
3a972c4d85 Precision issue in stock reconciliation 2018-01-08 12:35:05 +05:30
Zlash65
745c2658eb delete root node allow 2018-01-08 11:53:52 +05:30
ci2014
5d3e486415
Fix english typo in source code 
Fix english typo in source code
 2018-01-06 04:04:06 +01:00
Prateeksha Singh
620e0981cb
Merge pull request #12347 from pratu16x7/buying-fix 
[minor][buying] fix schedule date check
 2018-01-05 21:31:58 +05:30
Prateeksha Singh
cbd06fd3c6 [minor][buying] fix schedule date check 2018-01-05 21:28:01 +05:30
Nabin Hait
2f51c6900b Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:20:05 +05:30
Nabin Hait
07e5376043 Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:19:59 +05:30
Nabin Hait
cab8dfc5fb Fixed merge conflict 2018-01-05 14:15:39 +05:30
Nabin Hait
cb495fb33b Merge branch 'master' into develop 2018-01-05 13:17:00 +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