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

13176 Commits

Author SHA1 Message Date
Nabin Hait
527e6c02b3 Delete BOMs on deletion of company 2018-01-09 16:29:13 +05:30
Nabin Hait
6b89644ca7 Payment terms filter in AR report 2018-01-09 15:39:35 +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
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
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
Saurabh
eac2e369cf [fix] setup alias for ifnull condition (#12327) 2018-01-05 12:48:08 +05:30
Manas Solanki
a521efc990 fix for the non stock items for the shopping cart (#12294) 2018-01-05 12:47:20 +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
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
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
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
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
Manas Solanki
91017cba8d Additional fields in the instructor doctype for the academics log and minor permission changes (#12204) 2017-12-28 12:34:36 +05:30
Frappe PR Bot
878b5f7e71 [Translation] Updated Translations (#12212) 2017-12-28 12:31:01 +05:30
Manas Solanki
e20a0f1115 [Fix] make PE unique for the combination of academic year and academic term (#12214) 2017-12-28 12:29:11 +05:30
Fahim Ali Zain TP
5f7cedb206 Fix v8 to v10 migration issue (#12177) 2017-12-27 17:14:54 +05:30
Nabin Hait
a47ea94ab4 bumped to version 10.0.2 2017-12-26 19:05:49 +06:00
Nabin Hait
9e16697702 Merge branch 'master' into develop 2017-12-26 18:34:16 +05:30
Nabin Hait
451af06d2f bumped to version 10.0.1 2017-12-26 19:04:16 +06:00
Nabin Hait
123759aff7
Fixes for travis (#12161) 
* Fixes for travis

* Testcase fixes for get_item_details

* Testcase fixes for get_item_details

* Travis fixes

* Travis fixes
 2017-12-26 17:50:34 +05:30
rohitwaghchaure
30e38ff7c7 [Fix] Asset make sales invoice (#12168) 2017-12-26 16:23:06 +05:30
Vishal Dhayagude
f06c281964 [fix] allow to change doc status on get items (#12174) 2017-12-26 16:22:40 +05:30
Manas Solanki
5e9d1246e8 remove the autoname from the supplier json 2017-12-26 15:21:03 +05:30
Nabin Hait
6211a3edf2 bumped to version 10.0.0 2017-12-25 15:54:48 +06:00
Nabin Hait
ed13b3c19a Fixed minor issue 2017-12-25 15:11:56 +05:30
Nabin Hait
c65279b584 Reloaded account doctype in UAE Vat patch 2017-12-25 15:02:54 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
Nabin Hait
f4c5cf5bd0 bumped to version 9.2.24 2017-12-25 14:08:05 +06:00
Nabin Hait
e9dabd5cec
Settings to show payment schedule in print (#12158) 2017-12-25 13:30:01 +05:30
Prateeksha Singh
293c700c08
Merge pull request #12157 from pratu16x7/setup-fixes 
[setup] remove sample data commit, fix namespace
 2017-12-25 12:31:23 +05:30
Prateeksha Singh
b61d091f4c [setup] remove sample data commit, fix namespace 2017-12-25 12:30:35 +05:30
Nabin Hait
9da6844b52 Version 10 change log 2017-12-25 12:25:52 +05:30
rohitwaghchaure
79f8784772
Merge pull request #12156 from rohitwaghchaure/company_setup_issue 
[Fix] Setup wizard UAE/KSA
 2017-12-25 12:12:57 +05:30
Rohit Waghchaure
cfafb21842 [Fix] Setup wizard UAE/KSA 2017-12-25 12:12:07 +05:30
tundebabzy
590bd0a8e5 trigger payment_terms_template only when needed (#12124) 2017-12-25 11:40:19 +05:30
rohitwaghchaure
bd5e01b09b [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#12134) 2017-12-25 11:28:07 +05:30
rohitwaghchaure
d8c6449f3a [Fix] Bom raw materials not in order in the stock entry (#12149) 2017-12-25 11:26:40 +05:30
rohitwaghchaure
75789b65c2 [Fix] Sales payment summary report (#12151) 2017-12-25 11:26:15 +05:30
Zarrar
adc184c872 [Minor] Fix adding child to root task issue (#12121) 
* make parent_task none

* adding multiple tasks - set project of parent
 2017-12-22 11:00:19 +05:30
rohitwaghchaure
443691aaf8 [Fix] Allow to change exchange rate in the payment entry if allow stale is enabled (#12128) 2017-12-22 10:59:01 +05:30
Ameya Shenoy
3909bd4e9f [agri] Disease task creation on new CropCycle fix (#12131) 2017-12-22 10:58:47 +05:30
Manas Solanki
5807cd8e6f Set the guardian role automatically. (#12136) 
* Add the guardian role for parent portal

* invite guardian as user
 2017-12-22 10:50:10 +05:30
tunde
e3104938ff fix typo 2017-12-21 16:25:44 +01:00
Manas Solanki
45cb791878
Merge pull request #12130 from manassolanki/leaderboard 
remove the print statements
 2017-12-21 13:04:25 +05:30
Manas Solanki
1f4b530e68 remove the print statements 2017-12-21 12:57:43 +05:30
Prateeksha Singh
8b0b56dda4 [Setup Wizard] Use setup stages (#12000) 
* setup working with packages imports for operations

* setup stages

* use setup_stages hook

* remove commit from app setup
 2017-12-21 11:55:58 +05:30
Umair Sayed
82035c6c7a Update index.md (#12118) 2017-12-21 11:55:05 +05:30
Nabin Hait
e591c85f7c Payment schedule total amount validation considering write off amount 2017-12-21 11:47:08 +05:30
Nabin Hait
a5cc84f8af
Reverted gl entry splitting based on payment terms (#12117) 
* Reverted gl entry splitting based on payment terms

* changed modified date
 2017-12-21 11:37:18 +05:30
rohitwaghchaure
174900506e [HotFix] Validation issue for subcontract stock entry (#12127) 
* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py
 2017-12-21 11:28:01 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms (#12115) 2017-12-20 12:24:59 +05:30
rohitwaghchaure
84da00da2f Allow to add items in manufacturing process which are not part of bom items (#12110) 2017-12-20 12:06:09 +05:30
Manas Solanki
8413f76c19 set the mandatory field in the backend (#12102) 2017-12-20 12:03:19 +05:30
Vishal Dhayagude
c8ecfa15f3 [new] Make Timesheet UX Added (#12100) 2017-12-20 12:02:34 +05:30
Ameya Shenoy
87b7844ae8 [Agri] Item amount set on item set (#12091) 
* [Agri] Item amount set on item set

- closes #12008
- fixes #12010

* used frappe.call instead of frm.call in crop

* made modifications for sql query for BOM Item

- done since Crop doctype in Agri module also uses 'BOM Item' child table

* hide BOM no from BOM Item childtable in Crop
 2017-12-20 12:00:24 +05:30
Prateeksha Singh
9a57049faa
Merge pull request #12113 from pratu16x7/leaderboard 
Add Leaderboard to desktop
 2017-12-20 11:39:05 +05:30
Prateeksha Singh
04c4ce353c Add leaderboard to desktop 2017-12-20 10:51:25 +05:30
Saurabh
6386e9a1bd [fix] set asset owner demo data 2017-12-19 14:52:07 +05:30
tundebabzy
dbd068c44b Sales Order With Payment Terms Not Split In Payment Entry #12051 (#12065) 
* validate schedule dates in non-invoice documents

* change query for orders

* take care of orders with/without payment schedule

* clean up, refactor, PEP8
 2017-12-19 14:36:39 +05:30
Prateeksha Singh
41d2feab35
Merge pull request #12099 from pratu16x7/user-progress-items-fix 
Create item price only if item created
 2017-12-19 12:54:58 +05:30
Prateeksha Singh
3942cd353a create item price only if item created, fixes #12041 2017-12-19 12:53:39 +05:30
tundebabzy
90076bc3b5 Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12047) 
* split journal entry according to invoice due date

* fix bug where reference_due_dates options are not populated:
- after making JE, add options to _onload
- use __onload to add options

* cater for case where no payment_schedule
 2017-12-19 11:58:31 +05:30
Ameya Shenoy
6e5b8bb5d3 fixed logic for creating disease tasks (#12081) 2017-12-19 11:41:10 +05:30
tundebabzy
5825dedf7c Payment schedule error #12057 (#12096) 
* use 12 places precision for sums

* use high float precision, fix decimal place late

* Update accounts_controller.py
 2017-12-19 11:39:20 +05:30
Nabin Hait
f592f2c9a9
Revert "[Fix] Payment terms validation issue" (#12098) 
* Revert "test fixed (#12094)"

This reverts commit dd700a550f.

* Revert "[fix] Column Heading in received item to be billed report (#12083)"

This reverts commit 7c57b6ecd8.

* Revert "[fix] Mobile no search issue in the pos (#12090)"

This reverts commit b725affe0c.

* Revert "[Fix] Payment terms validation issue (#12092)"

This reverts commit 9b8e1cb10e.
 2017-12-19 11:31:34 +05:30
Shreya Shah
dd700a550f test fixed (#12094) 2017-12-19 11:24:07 +05:30
Vishal Dhayagude
7c57b6ecd8 [fix] Column Heading in received item to be billed report (#12083) 2017-12-19 11:23:34 +05:30
rohitwaghchaure
b725affe0c [fix] Mobile no search issue in the pos (#12090) 2017-12-19 11:21:00 +05:30
rohitwaghchaure
9b8e1cb10e [Fix] Payment terms validation issue (#12092) 2017-12-19 11:20:29 +05:30