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
pratu16x7
52d703a232
[fix] test
2017-06-22 18:13:54 +05:30
pratu16x7
e4e00d2215
batch item distribution by oldest, serial no check
2017-06-22 18:13:54 +05:30
pratu16x7
60944e3397
get oldest batch in modal, insert batch items
2017-06-22 18:13:30 +05:30
pratu16x7
0b642cd414
set available qty
2017-06-22 18:13:30 +05:30
pratu16x7
b4de1c771b
WIP
2017-06-22 18:13:30 +05:30
Rushabh Mehta
aedaac63ea
[wip] batch, serial number selector
2017-06-22 18:13:30 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Rohit Waghchaure
2d9b3cd270
Fixed test cases
2017-06-22 12:23:15 +05:30
Makarand Bauskar
ce7087f08a
Merge pull request #9408 from mbauskar/develop
...
merged hotfix branch to develop
2017-06-21 16:41:33 +05:30
Makarand Bauskar
b37eb10421
Merge pull request #9382 from nick9822/nick9822-patch-1
...
Resetting batch and serial nos checks
2017-06-21 16:34:32 +05:30
mbauskar
196f3b1fb8
resolved merge conflicts
2017-06-21 14:38:06 +05:30
Saurabh
8d269beb45
[minor][fix] pass template item name to make_variant_item_code
2017-06-20 20:14:14 +05:30
Makarand Bauskar
cd5dd890aa
Merge pull request #9384 from nick9822/nick9822-patch-2
...
Bug while fetching stock balance of new item.
2017-06-20 19:52:28 +05:30
nick9822
cc699a94fd
Bug while fetching new item balance.
2017-06-20 17:13:29 +05:30
nick9822
43a48fd2bc
Resetting batch and serial nos checks
2017-06-20 17:02:55 +05:30
Vishal Dhayagude
310d4dc9e0
UOM column in Batch Wise Balance History Report ( #9359 )
...
* Training Events/Results link to employee dashbord
* [minor]Improve validation message for Buying / Selling Setting
* [minor]Added UOM cloumn in Batch Wise Balance History Report
* modified validation message for buying / selling setting
2017-06-20 13:02:35 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
65ccb42f95
fixed document
2017-06-20 10:21:34 +05:30
Rohit Waghchaure
6945d0dd8a
fixed test cases
2017-06-20 10:21:33 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
Rushabh Mehta
80ef298519
[fix] [tests] test_delivery_note
2017-06-20 10:07:28 +05:30
Rushabh Mehta
36311020de
[minor] ux fixes
2017-06-20 09:31:06 +05:30
Rushabh Mehta
b7b49f6da7
[fixes] fix message and type conversion;
2017-06-19 09:59:09 +05:30
Britlog
224eb90199
Fix get_parents context ( #9296 )
2017-06-16 11:51:06 +05:30
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
KanchanChauhan
c849f647f7
Show Stock Level only if any value(actual, reserved, reserved for production or projected) exists ( #9168 )
2017-06-14 15:37:47 +05:30
Manas Solanki
40be3f4048
fix in the item for the function make_variant_item_code ( #9280 )
2017-06-14 15:06:07 +05:30
Sagar Vora
489ab6d70d
[minor] remove hardcoded flt precision and use system default ( #9250 )
...
* possible fix
* use system default precision for flt
2017-06-13 18:58:47 +05:30
Saurabh
797f2030f8
Merge branch 'master' into develop
2017-06-13 15:20:13 +05:30
Makarand Bauskar
8ce53c94d1
Merge pull request #9189 from mbauskar/mysql-lockout
...
[hotfix] fixes for mysql Lock wait timeout exceeded
2017-06-13 14:41:42 +05:30
