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

2068 Commits

Author SHA1 Message Date
tundebabzy
e1e38a4bb9 Autoname for Batch DocType #12302 (#12461) 
* add new fields:
check: use naming series
data: series prefix

* refactor autoname:
use new function - get_name_from_hash

* add new function - get_name_from_naming_series

* refactor autoname to generate name from naming series

* PEP 8 compliance
 2018-01-12 16:30:02 +05:30
tundebabzy
df023bff7f add posting_date/transaction_date to list_view (#12453) 2018-01-12 16:27:29 +05:30
Sachin Mane
24e2735e19 Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381) 
* 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"

* Add Shelf Life (Item) and Manufacturing Date (Batch) fields

* remove console.log

* fix ci issues

* Update batch.js
 2018-01-11 12:45:50 +05:30
Charles-Henri Decultot
47ad7fb129 Multiple variant correction (#12424) 2018-01-11 12:29:45 +05:30
Zarrar
94f9f48d70 set from_warehouse only if purchase_order and purpose found (#12398) 2018-01-10 16:29:40 +05:30
Saurabh
892a7a6980 resolved merge conflicts 2018-01-09 12:05:20 +05:30
rohitwaghchaure
412e044e8f [Fix] Error in stock move from batch dashboard (#12377) 2018-01-09 11:27:35 +05:30
Nabin Hait
3a972c4d85 Precision issue in stock reconciliation 2018-01-08 12:35: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
28d0230e56 Multiple small fixes 2018-01-05 13:14:25 +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
rohitwaghchaure
bc2c83ee3c Companywise default tax template (#12290) 
* Companywise default tax template

* Fix test cases
 2018-01-05 12:42:02 +05:30
Nabin Hait
c33788a91b Show standard rate only in unsaved Item 2017-12-29 15:42:50 +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
rohitwaghchaure
fe22686a8f Update last purchase rate from the purchase invoice (#12189) 2017-12-28 16:11:27 +05:30
Nabin Hait
ca674bec42
Set numeric ranges in Item tamplate if blank (#12199) 2017-12-28 12:35:11 +05:30
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
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +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
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
Nabin Hait
2afcff1852 Get outstanding invoices on payment entry 2017-12-15 17:32:03 +05:30
Manas Solanki
53e47e6ba5 frappe call only if item code or serial no is ther (#12036) 2017-12-15 15:47:52 +05:30
rohitwaghchaure
ce8adecbad Incoming rate fixes (#11986) 2017-12-15 12:13:50 +05:30
Nabin Hait
0f97eda7c9 Merge branch 'master' into develop 2017-12-12 19:17:53 +05:30
Zarrar
21ea6cdb91 batch.expiry should be sorted in ascending order too (#11960) 2017-12-12 18:54:17 +05:30
Nabin Hait
aab1182c73
Update stock_entry.js 2017-12-12 18:45:39 +05:30
KanchanChauhan
3ca00c7143 Items should not be used from Sample Retention warehouse (#11905) 2017-12-11 14:59:19 +05:30
Shreya Shah
1b30642362 cal difference amount when qty 0 (#11925) 2017-12-11 14:56:57 +05:30
KanchanChauhan
236ac5eb38 [Fix] Customer and Address blank if does not exist in Delivery Stops (#11895) 2017-12-11 12:38:30 +05:30
KanchanChauhan
7f8df06663 [Minor]Removed alert=true from frappe.throw (#11904) 2017-12-11 12:24:43 +05:30
Prateeksha Singh
0419e2384d reinitialize variant attribute table, fixes #11900 (#11921) 2017-12-11 12:22:28 +05:30
Asharam Seervi
98d5878aa2 Added Column Break in Item Master (#11887) 
* Fixed: On Item form, added cb.

* Fixed: On Item form, added cb.
 2017-12-08 16:18:23 +05:30
Zarrar
17fd6610dc Fix travis (#11882) 
* fieldname wrong

* bifurcated test into two - error when both were running async

* minor fixes with link and route

* move school domain rename up

* fix async creation of operations test

* edit-in-full-page is button, not link

* set_route issue in production order test

* minor changes

* fix task tree test

* more fixes

* fix server side issue

* improvising ui tests
 2017-12-08 14:57:38 +05:30
Doridel Cahanap
9f7e109c3e [minor] Fix Delivery Trip Error (#11868) 2017-12-07 11:52:33 +05:30
Nabin Hait
bb09437d1f
Merge branch 'develop' into payroll_entry 2017-12-06 19:18:40 +05:30
Shreya Shah
b13a54ac74 Checkbox in Price list for Price not UOM dependant (#11836) 
* checkbox price not uom dependant

* change price list rate on uom dependancy condition

* test case

* Update get_item_details.py
 2017-12-06 19:17:03 +05:30
KanchanChauhan
f6aff3de96 [New Feature] Sample Retention from a Batch of item recieved (#11624) 2017-12-06 18:38:01 +05:30
Nabin Hait
c84476bd27 Fixed merge conflict 2017-12-06 14:17:51 +05:30
Shreya
e570e4a049 fixed a test 2017-12-04 16:49:44 +05:30
Shreya
eba3f39bbe test delivery trip fix 2017-12-04 16:04:56 +05:30
Nabin Hait
a11dcb6e59
Pull items in Stock Entry from Purchase Invoice (#11839) 2017-12-04 13:36:50 +05:30
tundebabzy
3061fc92fd Batch Stock Items, having serial number can't be moved without inserting Serial Number (#11792) (#11813) 
* if doctype is batch, add extra information to args

* automatically fetch serial numbers if possible

* take advantage of changes in make_stock_entry

* code clean up

* PEP 8 compliance

* fix bug that clears serial number
 2017-12-04 11:23:21 +05:30
pawan
2ff844e740 default warehouse / remove validation / change sql 2017-11-30 18:14:55 +05:30
Nabin Hait
1b89be0c66
Fixed rounding issue in subcontracting (#11802) 2017-11-30 15:59:56 +05:30
rohitwaghchaure
e34ef60e3e [fix] Asset test cases and added make_sales_invoice (#11800) 
* [fix] Asset test cases and added make_sales_invoice

* vehicle trip test cases
 2017-11-30 15:59:40 +05:30
pawan
e4aaff6686 message changes 2017-11-30 15:49:54 +05:30