Vishal Dhayagude
1458d7fea6
[UI Test] Stock Entry for material issue with serialize item ( #10592 )
2017-08-31 14:47:01 +05:30
Faris Ansari
491108a198
Merge branch 'develop' into pos-refactor
2017-08-30 12:37:05 +05:30
mbauskar
5096c45dec
Merge branch 'master' into hotfix
2017-08-29 20:42:06 +05:30
tundebabzy
1a947dbf6a
Item Name not loaded in Material Request via BOM ( #10535 ) ( #10555 )
...
* adds item_name to child table
* adds two new functions to utils:
- first_row_is_empty: to check if first row in child table is empty
- remove_empty_first_row: to remove the empty first row in a child table
* removes empty first row after getting from BOM
* ui test
2017-08-29 18:18:27 +05:30
Rohit Waghchaure
ba3f0e6b70
Added serial no, batch no, item group functionality
2017-08-28 19:45:58 +05:30
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Vishal Dhayagude
7ed4bfe7ee
[UI Test] UI Test for Material Receipt with Serialize Item Added ( #10565 )
...
* [UI Test] UI Test for Material Receipt with Serialize Item Added
* [fix]Codacy fixed
2017-08-28 16:53:25 +05:30
Vishal Dhayagude
872bebbbf8
[UI Test] Stock Entry for Subcontract ( #10574 )
2017-08-28 15:33:21 +05:30
Vishal Dhayagude
f8e6c44996
[UI Test] Stock Entry for Material Transfer to Manufacture ( #10572 )
2017-08-28 15:32:33 +05:30
mbauskar
5d0c4361ab
resolved merged conflicts
2017-08-28 11:58:44 +05:30
mbauskar
aaec42ebc2
resolved merged conflicts
2017-08-28 11:57:56 +05:30
Vishal Dhayagude
da2164373c
[UI Test] UI Test added for Batch ( #10564 )
2017-08-28 11:10:26 +05:30
Rushabh Mehta
6b651d734e
[fix] status in purchase_receipt.py ( #10534 )
2017-08-24 15:47:49 +05:30
Rushabh Mehta
4a546e6c18
[minor] delivery note standard filter
2017-08-23 16:16:43 +05:30
Nabin Hait
34c218b2de
Minor improvements based on skip_transfer ( #10457 )
2017-08-22 19:07:16 +05:30
mbauskar
4396a0e9a8
Merge branch 'master' into staging
2017-08-22 15:42:10 +05:30
mbauskar
3b3ab4d574
Merge branch 'master' into develop
2017-08-22 15:42:10 +05:30
rohitwaghchaure
187cea3602
[Fix] Accepting duplicate serial no is purchase receipt ( #10469 )
...
* [Fix] Accepting duplicate serial no is purchase receipt
* Fixed test cases
2017-08-22 15:38:32 +05:30
mbauskar
7716a08b5d
Merge branch 'master' into staging
2017-08-22 12:03:47 +05:30
mbauskar
7d9452f4e4
Merge branch 'master' into develop
2017-08-22 12:03:47 +05:30
Makarand Bauskar
a591d1df5f
[minor] ingore user permission for old_parent fields ( #10471 )
2017-08-21 19:04:49 +05:30
mbauskar
5088ad11ee
Merge branch 'master' into staging
2017-08-21 08:58:52 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
Makarand Bauskar
222e86bb13
[hotfix] fixed the mysql syntax error issue on stock ledger report ( #10442 )
2017-08-21 07:35:16 +05:30
Vishal Dhayagude
592e8c2e77
[UI Test] UI Test added for Stock Reconciliation ( #10432 )
...
* [UI Test] UI Test added for Stock Reconciliation
* [fix] Codacy
2017-08-18 15:01:20 +05:30
Vishal Dhayagude
2890fa74a2
[UI Test] UI Test for Purchase Receipt Added ( #10434 )
2017-08-18 11:55:14 +05:30
Manas Solanki
0371d5a326
new item group filter in the stock ledger report ( #10400 )
2017-08-16 11:35:04 +05:30
mbauskar
f03afe0878
Merge branch 'master' into staging
2017-08-14 09:31:01 +05:30
mbauskar
2fa8af3b02
Merge branch 'master' into develop
2017-08-14 09:31:01 +05:30
Vishal Dhayagude
22baba2cff
[UI TEST] Test added for Delivery Note ( #10376 )
2017-08-11 17:17:30 +05:30
Vishal Dhayagude
4157b64776
[UI Test] Multiple UI Test for Stock Entry added ( #10354 )
2017-08-11 12:06:16 +05:30
rohitwaghchaure
2e8232e7aa
[Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company ( #10320 )
2017-08-10 11:32:59 +05:30
Vishal Dhayagude
e05c2e5d95
[UI Test] for Stock Entery ( #10346 )
2017-08-09 17:36:04 +05:30
Vishal Dhayagude
bde05e96a6
[UI TEST] Multiple test for Materail request ( #10347 )
2017-08-09 16:56:14 +05:30
Vishal Dhayagude
da30a69ee7
[UI Test] test added for Material Request ( #10338 )
...
* [UI Test] test added for Material Request
* [mod] date in material request
2017-08-09 13:08:38 +05:30
KanchanChauhan
71088aa2bd
Supplier Part No in Purchase Receipt since it exits in Purchase Order ( #10314 )
2017-08-08 14:41:35 +05:30
mbauskar
1065679720
Merge branch 'master' into staging
2017-08-08 12:54:12 +05:30
KanchanChauhan
255c5f4407
Supplier Delivery Note field added to Purchase Receipt, good to have for future references ( #10309 )
2017-08-08 11:23:45 +05:30
Nabin Hait
19128134a8
Merge pull request #10295 from tundebabzy/issue-10099-2
...
BOM Currency symbol issue (#10099 ) - Stock Ledger report
2017-08-07 13:49:22 +05:30
tunde
80a9f37272
add options in get_columns
2017-08-04 12:08:09 +01:00
Ameya Shenoy
4331067e57
[ui-test] completed tests for manufacturing ( #10218 )
...
* modified test_item to include child table assertions
* minor travis fixes
* removed css selectors and used cur_frm
2017-08-04 10:50:32 +05:30
Kanchan Chauhan
1fd17a9a67
[Minor] Country field name should be country
2017-08-03 10:18:43 +05:30
tunde
7663bbadb9
edit Doctypes to use company currency
2017-08-03 00:05:56 +01:00
Ameya Shenoy
4e91f28ce5
[ui-testing] added test for production order ( #10138 )
...
* temporary commit for switching branches
* [ui-tests] added bill_of_materials test
* added warehouses required for production order
* [ui-test] added production order test
* debugging travis failure
2017-07-31 11:02:28 +05:30
Faris Ansari
482331b987
[fix] Default Warehouse not obeying form value ( #10153 )
2017-07-28 20:58:39 +05:30
Rushabh Mehta
be4fd1100d
[fix] test
2017-07-28 15:54:07 +05:30
Saurabh
c07741d36f
Merge branch 'master' into staging
2017-07-27 17:50:28 +05:30
Saurabh
8907f1d2c3
Merge branch 'master' into develop
2017-07-27 17:50:27 +05:30
Makarand Bauskar
145393b12f
[hotfix] set the account name in GL entry instead of warehouse ( #10134 )
2017-07-27 16:46:40 +05:30
Makarand Bauskar
9c6e2c3637
[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends ( #10127 )
2017-07-27 16:23:57 +05:30
tundebabzy
296603a861
auto populate all rows ( #10090 )
2017-07-27 11:47:56 +05:30
cclauss
6848708377
old style exception, raise --> new style for Python 3 ( #10082 )
...
* old style raise --> raise() for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style raise --> raise() for Python 3
* old style raise --> raise() for Python 3
* old style exception, raise --> new style for Python 3
2017-07-27 10:38:35 +05:30
Saurabh
dc6e369172
Merge branch 'master' into develop
2017-07-25 16:42:28 +05:30
rohitwaghchaure
4cccdbdbf9
[Fix] Validating price list currency even if price list is not defined ( #10056 )
2017-07-25 14:05:01 +05:30
Makarand Bauskar
dfc5a454b3
[minor] fixed the delivery date issue in Ordered Item to be Dellivered report ( #10028 )
2017-07-25 10:48:43 +05:30
Nabin Hait
9c42161061
Itemised tax breakup fix in docs other than invoice ( #9961 )
...
* Itemised tax breakup fix in docs other than invoice
* Set itemised tax breakup and hsn code in existing docs
2017-07-20 13:32:01 +05:30
Nabin Hait
338c28e78e
Merge pull request #9902 from rohitwaghchaure/sales_invoice_serial_no_issue_from_dn
...
[Fix] Sales invoice serial no validation issue
2017-07-18 13:05:50 +05:30
Rohit Waghchaure
7e14996995
[Fix] Sales invoice serial no validation issue
2017-07-18 12:59:55 +05:30
Nabin Hait
4c40a416e6
Merge pull request #9900 from frappe/fixes_9899
...
[fix] #9899
2017-07-18 11:17:45 +05:30
Nabin Hait
3020c8086c
Update stock_balance.py
2017-07-18 11:17:32 +05:30
Nabin Hait
b962fc1573
Show hsn code in tax breakup for India and render via template ( #9866 )
...
* Show hsn code in tax breakup for India and render via template
* tax breakup if gst_tax_field does not exists
* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
pawan
36025468a1
[fix] #9899
2017-07-17 17:28:44 +05:30
Nabin Hait
e06526ffff
Add indexes in some transaction doctypes ( #9889 )
2017-07-17 13:28:27 +05:30
Rushabh Mehta
3df2c9421a
[fix] setup wont be called if declared inside setup
2017-07-13 16:11:54 +05:30
Makarand Bauskar
8f507a984e
[minor] check if the company is selected or not before triggering get_bank_cash_account ( #9830 )
...
* [minor] check if the company is selected or not before triggering get_bank_cash_account
* [minor] check if production order is available
* [minor] fixed codacy errors
2017-07-13 11:44:29 +05:30
Nabin Hait
7312186c76
Set corrected states list in GST State field's options
2017-07-13 10:41:15 +05:30
Nabin Hait
0a32b7a6eb
Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code
2017-07-12 19:21:05 +05:30
Nabin Hait
cdf4320b3b
Merge pull request #9673 from rohitwaghchaure/serial_no_sales_return_issue
...
Remove sales invoice from serial number while making sales return entery using delivery note
2017-07-10 19:04:30 +05:30
mbauskar
ccaf36a00f
[minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field
2017-07-10 16:24:24 +05:30
Britlog
8c85562ceb
Breadcrumbs management ( #9544 )
2017-07-10 12:14:05 +05:30
Rohit Waghchaure
934e69fe0b
Remove sales invoice from serial number while making sales return entery using delivery note
2017-07-06 18:19:18 +05:30
Rohit Waghchaure
6d03790b44
Revert sales invoice serial no issues
2017-07-06 15:58:50 +05:30
Nabin Hait
949a920022
Production Order Enhancements ( #9432 )
...
* Production Order Enhancements
- Show required items child table
- Source warehouse for each raw materials, in Pro Order Item and BOM Item table
- Group warehouse allowed for source and wip warehouse
- Patch to populate required items, to fix status and reserved qty for stopped pro order
- Cleaned up existing codes
- Test cases
* Set available qty in source and wip warehouse
* minor fix in bom query naming
* Minor Fixes
* Reload BOM doctypes in patch
2017-07-05 13:55:41 +05:30
Doridel Cahanap
5ad4a6e161
Total Stock Summary ( #9465 )
...
* Total Stock Summary
* indentation fixes and removed the for loop
* minor fixes in total stock summery report
2017-07-05 10:49:09 +05:30
tundebabzy
6015f0f2ec
Inspection required before delivery isn't working for item variants ( #9362 )
...
* makes `copy_attributes_to_variant` to not ignore "Table"
* fixes test cases - `test_auto_material_request` and `test_auto_material_request_for_variant`
* adds test case - tables in templates should be copied to variants
* [ci] use deprecated trusty build for now
2017-07-04 15:43:02 +05:30
Rushabh Mehta
43ef4e9047
Added first UI tests ( #9532 )
...
* [wip]
* [tests] wip
* [ui-tests] first-cut
* [minor] remove old tests
2017-07-03 11:53:07 +05:30
Rohit Waghchaure
eb7eb43dfc
[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before
2017-06-27 17:34:44 +05:30
pratu16x7
846f5d4bd8
[fix] cloning rows
2017-06-27 14:03:56 +05:30
pratu16x7
29cebbb0cd
use set_value() for setting rows
2017-06-27 09:48:28 +05:30
pratu16x7
89d001caf3
[lint] fixes
2017-06-26 17:45:49 +05:30
pratu16x7
ae450fc23b
async call to require, more validation
2017-06-26 15:31:46 +05:30
pratu16x7
5f389c999a
[fix] values update in items in invoices
2017-06-26 13:38:24 +05:30
pratu16x7
577e4c4e28
Add in transaction.js, cleanups
2017-06-23 19:25:01 +05:30
pratu16x7
759f669214
Add in delivery note
2017-06-22 18:14:29 +05:30
pratu16x7
70eca9462b
make erpnext.SerialNoBatchSelector
2017-06-22 18:14:29 +05:30
pratu16x7
60d9446656
onchange in df
2017-06-22 18:14:29 +05:30
pratu16x7
934105bf34
fix modified by, blur serial field
2017-06-22 18:14:28 +05:30
pratu16x7
26b8f5c3ce
[minor]
2017-06-22 18:14:16 +05:30
pratu16x7
36693e27be
[fix] tests
2017-06-22 18:14:16 +05:30
pratu16x7
a5d5403bf3
specific change bubbling for grid fields
2017-06-22 18:13:56 +05:30
pratu16x7
0e35651e94
Add get_stock_qty test
2017-06-22 18:13:56 +05:30
pratu16x7
837ffbddbc
[minor]
2017-06-22 18:13:55 +05:30
pratu16x7
ff25573558
cleanup
2017-06-22 18:13:55 +05:30
pratu16x7
82a199d6d7
[fix] availably qty reupdate
2017-06-22 18:13:55 +05:30
pratu16x7
d15a507567
add serial_no_check
2017-06-22 18:13:55 +05:30
pratu16x7
01e79f033e
add warehouse selection and mapping
2017-06-22 18:13:55 +05:30
pratu16x7
9a6e675b41
wip
2017-06-22 18:13:55 +05:30
pratu16x7
7331f169fc
[fix] warehouse required bug
2017-06-22 18:13:54 +05:30
pratu16x7
d09f35fa98
fire modal on item_code, events, validation
2017-06-22 18:13:54 +05:30
