brotherton-erpnext

Author	SHA1	Message	Date
Deepesh Garg	ef0d26c161	feat: Validity for Item taxes (#20135 ) * feat: Validity for Item taxes * fix: Trigger for gst hsn code * fix: Sort taxes based on validity * fix: Validation for item tax template and filters based on validity * fix: Add missing semicolon * fix: Validate tax template only if item code available * fix: Do not validate or filter item tax template if no item taxes applied * fix: Consider item group for validating taxes * fix: Test cases for item tax validation * fix: Item tax template filtering fixes * fix: Add missing semicolon * fix: Remove unnecessary query	2020-01-06 15:34:15 +05:30
rohitwaghchaure	9af557f9d7	fix: incorrect batch fetched for the serialized items (#20119 ) * fix: incorrect batch fetched for the serialized items * Update stock_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-30 13:26:47 +05:30
thefalconx33	2073eeb8fa	fix: don't allow deletion of items which has work order assigned to it	2019-12-27 16:26:03 +05:30
Nabin Hait	f32fc230f7	fix: rounding adjustment while both inclusive tax and discount amount present	2019-12-25 14:01:38 +05:30
Saqib	0ad7449ae3	feat: allow adding & deleting of items in submitted SO & PO (#19911 ) * feat: allow adding of items after quotation submission * feat: allow deletion of items from submitted SO & PO * fix: case when items are added and deleted at once * fix: add test cases * For deletion of items while Updating Items after submitting PO & SO	2019-12-24 16:42:30 +05:30
Don-Leopardo	5557b16260	fix: order_type validation restriction (#18096 )	2019-12-24 16:39:34 +05:30
Sun Howwrongbum	088be37e64	feat: consider expiry_date during Batch queries (#20065 )	2019-12-24 12:29:25 +05:30
Rohit Waghchaure	c2a5f99a38	fix: incorrect consumed qty for partial purchase receipt in subcontracting	2019-12-20 13:01:02 +05:30
Rohit Waghchaure	8bd84b28ca	fix: schedule date	2019-12-16 12:29:07 +05:30
Rohit Waghchaure	21fe97e723	fix: pricing rule not working for production discount	2019-12-16 11:15:53 +05:30
Nabin Hait	acdd5081da	fix: Service start and end date validation for deferred accounting (#19805 )	2019-12-04 15:30:01 +05:30
Marica	c68a940aac	fix: Item qty cannot be zero in Purchase Receipt (#19779 )	2019-12-03 12:59:22 +05:30
Suraj Shetty	9d6d95c4a2	fix: valuation of "finished good" item in purchase receipt (#19268 ) * fix: Remove redundant purchase orders and unwanted condition * fix: [WIP] Purchase receipt value * fix: Add raw material cost based on transfered raw material * fix: get_qty_to_be_received * fix: Remove debugger statement * fix: Reset rm_supp_cost before setting subcontracted raw_materials * test: Fix and modify tests for backflush_based_on_stock_entry * fix: Add non stock items to Purchase Receipt from Purchase Order * fix: Ignore valuation rate check for non stock raw material * fix: Rename check all rows * fix: Remove amount from test * test: Fix item rate error * fix: handling of serial nos in backflush * fix: Add serial no. of raw materials * fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material * fix: Raw material batch number selection in purchase receipt * Update test_purchase_order.py	2019-11-29 13:26:52 +05:30
Nabin Hait	a7d168c05f	fix: merge conflict	2019-11-25 18:12:56 +05:30
Saqib	cd3976f7d2	Asset cancellation fix (#19671 ) * fix: remove asset movement mandatory fields * fix: label for reference doctype	2019-11-25 12:24:34 +05:30
Saqib	f37a46edea	Fixed Asset Refactor Review fixes (#19665 ) * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:50 +05:30
Saqib	1919af2ff1	Fixed Asset Refactor Review fixes (#19666 ) * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:34 +05:30
Rohit Waghchaure	a831848074	fix: code cleanup	2019-11-20 19:42:27 +05:30
Rohit Waghchaure	eed30c6d8c	fix: not able to select item in sales order	2019-11-20 19:42:11 +05:30
rohitwaghchaure	95270ad14b	Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order fix: not able to select item in sales order	2019-11-19 19:40:11 +05:30
Rohit Waghchaure	248585b5a1	fix: code cleanup	2019-11-19 19:21:27 +05:30
Rohit Waghchaure	c42312ea12	fix: not able to select item in sales order	2019-11-19 19:06:51 +05:30
rohitwaghchaure	a85ddf2fb4	fix: performance issue of sales invoice while save/submit (#19598 ) * fix: performace issue of sales invoice while save/submit * Cached price list data, item group child data, added indexing for blanket order	2019-11-19 18:47:48 +05:30
Saqib	d995609ffa	Fixed asset refactor (#19369 ) * refactor: Asset Movement with multiple assets using table * refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset * feat: Auto create asset on Purchase checkbox * refactor: LCV for asset created via PR/PI * refactor: get asset category accounts from item master * refactor: Purchase Receipt for asset purchasing * refactor: Purchase Invoice for asset purchasing * fix: post-refactor delete fixes * refactor: moved asset validation from pr/pi on asset submission * fix: Asset Category should be defined for auto purchasing assets * fix: undo serial_no_update removal (for non asset item) from LCV * fix: remove duplicate calls from item.js * fix: args position of all occurrence of get_asset_category_account() * fix: test cases * fix: landed cost voucher validations * refactor: test case for auto creation of asset * fix: removed invalid assertions * fix: patch errors on travis * fix: codacy fixes * fix: PI Items not fetching details from item * fix: asset movement from list view having default purpose 'Receipt' * chore: msgprint for selecting item code first while creating asset manually * fix: alert messages * minor: asset movement fixes * fix: lcv was made against submitted assets * minor: ux fixes * refac: move specific asset validation to SINV * chore: remove make_purchase_invoice from asset form * make asset movement on asset submission * add PR & PI queries based on item code * refac: not allow last movement cancellation * move asset movement creation on asset submission * asset movement naming series * add tests * fix: code review changes * chore: remove unecessary asset movement updation * refac: setting latest location while making asset movements * Added extra validations * fix: form dashboard make lcv button * fix: auto asset movement creation validation * fix: allow lcv against other items after removing submitted assets * chore: remove unwanted condition * fix: mismatch debit credit on purchase of asset with valuation tax * chore: toggle required field based on movement type * chore: fix lcv error message * fix: travis failing * fix: travis failing test * fix: wrong conditions after merge * fix: cannot cancel assets * fix: travis failing* fix change in deletion of assets * fix: codacy * fix: process cancellation of assets * refac: cancellation of pr only deletes auto created assets * fix: incorrect query	2019-11-18 11:46:55 +05:30
rohitwaghchaure	090f9a3dc9	Merge pull request #19533 from rohitwaghchaure/fixed_precision_issue_while_updating_qty_and_rate fix: precision issue	2019-11-08 14:54:58 +05:30
Rohit Waghchaure	e93dc9f1cd	fix: precision issue	2019-11-08 13:43:15 +05:30
Marica	e37a67245e	fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note (#19388 )	2019-11-07 12:52:23 +05:30
Deepesh Garg	0bcf8b64f6	Merge pull request #19422 from marination/search-field fix: Search field entries included in Item Link field query	2019-11-01 15:38:25 +05:30
rohitwaghchaure	81c217584a	fix: purchase order issue, margin_rate_or_amount not there in the purchase documents (#19466 )	2019-10-31 15:56:10 +05:30
Anurag Mishra	a11e738801	feat: Stock value and account balance sync. (#19233 ) * feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked * fix(test): Sales Invoice * fix(test): Purchase Invoice * fix(test): Delivery Note * fix: more test_case * fix(test): Stock Entry * fix(test): Purchase Receipt * fix(more-test): Stock Entries * fix(more-test): Sales Invoice and Delivery Note * fix: tests for delivery note * fix: tests for stock reconciliation * refactor: stock and account balance function * fix(more-test): Warehouse * fix(test): Landed Cost Voucher * fix: changes requested	2019-10-31 15:55:03 +05:30
marination	1e754b161c	fix: Fetching catched meta and removed description fetch from Search Fields Description is conditionally fetched and also used in WHERE clause, that is maintained. Improved naming	2019-10-30 18:33:44 +05:30
marination	3dbef9de74	fix: Search field entries included in Item Link field query	2019-10-28 15:48:10 +05:30
rohitwaghchaure	5d0362669d	Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch fix: not able to select the zero qty batch while making the sales ret…	2019-10-23 18:35:58 +05:30
Rohit Waghchaure	d8ddd1e2ec	fix: not able to select the zero qty batch while making the sales return entry	2019-10-22 14:05:13 +05:30
Deepesh Garg	fbae893f07	Merge pull request #19306 from nabinhait/required_date_fix fix: Always set required date based on min date on item table	2019-10-21 15:25:23 +05:30
Nabin Hait	dd893254be	Update buying_controller.py	2019-10-21 13:40:00 +05:30
Nabin Hait	49a46f08de	fix: Set gross profit in SO item on updating rate after submission (#19311 )	2019-10-21 13:35:43 +05:30
Nabin Hait	a113861b0c	fix: Always set required date based on min date on item table	2019-10-15 12:43:27 +05:30
Mangesh-Khairnar	4ed9b45fb8	feat(Sales Order): Allow to skip delivery note creation (#19222 ) * feat(sales-order): add option to skip delivery note creation for order type maintenance * fix(sales-order): hide delivery date on setting skip delivery note creation * fix: allow skipping delivery note for all order types * fix: bypass delivery note creation on setting skip delivery note creation * fix: show skip delivery note in list view * fix: check for duplicate project name after submitting prompt * fix: toggle delivery note reqd for skip delivery note * fix: update status based on skip delivery note	2019-10-12 19:33:11 +05:30
rohitwaghchaure	285344eb0e	fix: over-bill error while making debit note against purchase return e… (#19270 ) * fix: overbill error while making debit note against purchase return entry * Update accounts_controller.py	2019-10-11 11:02:11 +05:30
Marica	f067447d9c	fix: Margin and Discount percentage set correctly via 'Update Items' (#19276 )	2019-10-11 10:47:09 +05:30
Faris Ansari	38ac7f7350	Enhancements to Supplier Portal (#19221 ) * fix: Add Purchase Order to portal * fix: Create Customer or Supplier on first login Based on default role set in Portal Settings, a Customer or Supplier will be created when the user logs in for the first time. * fix: Styling for transaction_row * fix: Styling for RFQ page * fix: Add Purchase Invoice route - Make Purchase Invoice from PO * fix: minor - Admissions for Student role - Remove print statement	2019-10-09 11:41:33 +05:30
Anurag Mishra	fe5890b828	fix: Query Condition On Billing date filters	2019-10-07 14:27:07 +05:30
Deepesh Garg	d138633c5b	Merge pull request #19163 from thefalconx33/small-fixes fix: Supplier field not getting populated in serial no on creation of asset	2019-09-25 22:09:41 +05:30
Marica	23d7b09389	fix: Item Rate within Update Items in Sales order (#19172 ) Blocked negative discount percentage, which affected the item rate every time Update Items action was taken	2019-09-25 17:17:36 +05:30
Rucha Mahabal	c6b548b5b2	fix(Stock): item variant description (#19134 )	2019-09-24 19:17:13 +05:30
thefalconx33	c15cc8fc28	fix: #18624	2019-09-24 18:49:16 +05:30
Marica	bac4b93639	fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master (#19066 ) Manufacturer Link field options in Items Table of transactions will also display manufacturer part no. Manufacturers table in Item master will check for duplicate entries.	2019-09-16 19:44:28 +05:30
Mangesh-Khairnar	7bcb24efbf	fix(purchase-invoice): Update paid amount on creation of debit note (#18830 ) * fix(purchase-invoice): set paid amount for purchase return * fix(purchase-invoice): remove payment schedule on creation of debit note	2019-09-11 10:49:33 +05:30
rohitwaghchaure	358a01a226	fix: Quotation Trends report not working for filter group by customer (#18989 )	2019-09-10 19:18:30 +05:30
Nabin Hait	88e8688a4b	fix: set raw material's batch based on main item's batch only if RM has batch no (#18977 )	2019-09-10 14:07:45 +05:30
Anurag Mishra	ac0c1edd23	feat: added date filter based on billing date and based date (#18936 )	2019-09-06 12:10:10 +05:30
KanchanChauhan	d114c8f88f	fix(Purchase Order): Status updater (#18612 )	2019-09-05 15:11:43 +05:30
Suraj Shetty	f75481fa23	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-30 15:45:18 +05:30
Rohit Waghchaure	13c7e183a6	fix: not able to save sales order	2019-08-29 20:03:52 +05:30
Suraj Shetty	8de8a78235	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-26 10:51:12 +05:30
Deepesh Garg	f3d78dd29c	fix: Duplicate items check in Sales Invoice (#18660 ) * fix: Duplicate items check in sales Invoice * fix: Commonified function for duplicate items check in selling controller * fix: Set valuation rate and transaction date in child tabel	2019-08-23 11:42:35 +05:30
Mangesh-Khairnar	5619db28cb	fix: fetch capital work in progress as expense account (#18780 )	2019-08-21 14:49:24 +05:30
Suraj Shetty	da2a623e38	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-21 11:48:27 +05:30
Sahil Khan	5f2c030ddc	Merge branch 'version-12-hotfix' into merge_v12_hotfix_1	2019-08-20 16:22:49 +05:30
Suraj Shetty	5124b2806d	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-20 12:05:51 +05:30
Deepesh Garg	33b392ac2b	Update erpnext/controllers/sales_and_purchase_return.py Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>	2019-08-19 17:43:10 +05:30
Deepesh Garg	3965451c7a	Update erpnext/controllers/sales_and_purchase_return.py Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>	2019-08-19 17:40:29 +05:30
deepeshgarg007	0487ad5515	fix: Code cleanup	2019-08-19 16:40:29 +05:30
deepeshgarg007	e2acc748c8	fix: Check for return against delivery noteas well	2019-08-19 16:38:04 +05:30
deepeshgarg007	7d288437d8	fix: Assignment	2019-08-19 16:19:48 +05:30
deepeshgarg007	c80e5fe7a1	fix: Failing sales and purchase return test cases	2019-08-19 14:38:15 +05:30
Deepesh Garg	5efedd7a60	fix: Travis (#18772 )	2019-08-19 12:56:22 +05:30
Anurag Mishra	19c3cb0d5b	fix: removed filters(not required) (#18729 )	2019-08-19 10:31:02 +05:30
Suraj Shetty	182f4def00	fix: Delivery note creation from pick list - Changes in serial no and batch no seletion - Changes in warehouse overrwite logic Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-16 08:16:22 +05:30
Suraj Shetty	83705af0b3	fix: Filters for portal quotation list (#18689 ) * fix: Filters for portal quotation list * fix: Remove unwanted import	2019-08-12 11:51:27 +05:30
rohitwaghchaure	5790fabd54	Merge pull request #18669 from rohitwaghchaure/removed_stock_item_condition_for_sub_contract_v12 fix: allow to subcontract service raw materials	2019-08-09 15:18:38 +05:30
Rohit Waghchaure	10e8073204	fix: allow to subcotract service raw materials	2019-08-08 18:20:53 +05:30
Mangesh-Khairnar	a3d5200194	fix(sales-order): update items (#18535 ) * fix(sales-order): update items * fix: minor changes * Update: accounts controller	2019-08-05 10:16:40 +05:30
Mangesh-Khairnar	9accae3ddc	fix(sales-order): update items (#18536 ) * fix(sales-order): update items * fix: minor changes	2019-08-05 10:16:25 +05:30
Deepesh Garg	8b0302bab9	fix: Make conversion rate optional for non itemized items (#18540 )	2019-08-05 10:14:19 +05:30
Deepesh Garg	cfb899451f	fix: Make conversion rate optional for non itemized items (#18541 )	2019-08-05 10:14:05 +05:30
Suraj Shetty	580fa48642	fix: Quotation list in customer portal (#18579 ) * fix: Quotation list in customer portal Customers were not able to see their quotations because of the recent customer field removal from quotation * fix: Remove duplicate code	2019-08-05 10:08:35 +05:30
deepeshgarg007	b656529818	fix: Error handling in taxes and totals	2019-08-03 13:49:33 +05:30
deepeshgarg007	8bf19ce81a	fix: Error handling in taxes and totals	2019-08-03 13:44:44 +05:30
Deepesh Garg	d301d26fda	fix: Enhancement in credit note (#18511 ) * fix: Credit note enhancement * Fix: Print format for Sales Invoice Return * fix: Zero quantity validation fix for credit note	2019-07-31 15:58:19 +05:30
Deepesh Garg	b65c761b16	fix: Enhancement in credit note (#18510 ) * fix: Credit note enhancement * Fix: Print format for Sales Invoice Return * fix: Zero quantity validation fix for credit note	2019-07-31 15:58:01 +05:30
Mangesh-Khairnar	3f8326358b	fix: remove wrong status update for order type maintenance (#18444 )	2019-07-22 16:24:56 +05:30
Anurag Mishra	305da799a4	Handling case for Material Request type 'Manufacture' v12 (#18365 ) * fix: status for 'material request type == Manufacture' * Patch: for setting status * fix: list view status	2019-07-22 11:35:16 +05:30
Faris Ansari	7ed5919d5b	fix(LoanApplication): Repayment amount check (#18376 ) * fix: Clickable Asset link * fix(LoanApplication): Repayment amount check	2019-07-22 11:30:05 +05:30
Mangesh-Khairnar	88620d6cbb	fix: precision on comparing with the outstanding amount (#18375 )	2019-07-22 11:29:26 +05:30
Karthikeyan S	747c2624cd	fix(BOM): Sever Error due in bom query to new behaviour of db.escape in v12 (#18401 ) fixes bug introduced by commit `6a7969117f`	2019-07-19 22:49:21 +05:30
Anurag Mishra	8a06b8fd38	fix precision	2019-07-17 14:55:16 +05:30
Deepesh Garg	322053ee1b	Merge pull request #18136 from nabinhait/inv-disc-improvements fix: set invoice status considering invoice discounting	2019-07-15 18:53:30 +05:30
Nabin Hait	868766ddf0	refactor: Refactored over delivery/receipt/billing fields (#17788 ) * refact: Refactored over delivery/receipt/billing fields * fix: test case	2019-07-15 18:02:58 +05:30
Nabin Hait	d83e39d0ac	Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements	2019-07-15 13:56:29 +05:30
Nabin Hait	b315acb5a7	fix: Calculate taxes and totals only if items added in transaction	2019-07-12 14:32:53 +05:30
Mangesh-Khairnar	6a7969117f	fix(bom): escape name with wildcard character (#18164 )	2019-07-08 10:40:40 +05:30
rohitwaghchaure	334335a2ef	fix: not able to make credit note for the sales invoice in which item code is not set (#18184 )	2019-07-08 10:26:29 +05:30
rohitwaghchaure	8a054e4b36	Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry feat: provision to make debit / credit note against the stock returned entry	2019-07-07 00:51:46 +05:30
Rohit Waghchaure	5d4d70b75f	feat: provision to make debit / credit note against the stock returned entry	2019-07-05 17:06:25 +05:30
Nabin Hait	7b684a01d3	fix: merge conflict	2019-07-04 12:06:50 +05:30
Shivam Mishra	7dedd9a8cd	refactor: better error message when changing variant value (#18144 )	2019-07-03 17:29:29 +05:30
Anurag Mishra	841d852f41	refactor: added missing translation functions (#18143 ) * fix: Translating Error and Messages * Update erpnext/controllers/item_variant.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com> * Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>	2019-07-03 15:15:08 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997 ) * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Nabin Hait	3bbcd491e4	fix: set invoice status considering invoice discounting	2019-07-02 15:31:24 +05:30
Nabin Hait	126a02e208	fix: set invoice status considering invoice discounting	2019-07-02 15:28:57 +05:30
Deepesh Garg	78a86af7fd	fix: Fiter passing fix in get batch query (#18131 )	2019-07-02 10:10:55 +05:30
Nabin Hait	659a01d819	Update accounts_controller.py	2019-07-01 15:16:49 +05:30
Mangesh-Khairnar	8c621ab90c	fix: precision for certain calculations in buying controller (#18008 ) * fix: precision for certain numbers * fix: check precision of the received_qty * Update buying_controller.py	2019-06-26 11:10:17 +05:30
Deepesh Garg	ea0574679f	fix: Removed submitted status from Quotation (#18055 ) * fix: Change in list view and status updater * fix: Change status in doctype * fix: Patch for submitted status	2019-06-26 11:05:51 +05:30
deepeshgarg007	e8d21cd8fa	fix: Division by zero error fix in group similar item	2019-06-24 18:49:24 +05:30
Anurag Mishra	4c1639305f	feat: creating stock entry against purchase receipt	2019-06-14 12:31:08 +05:30
Deepesh Garg	0d7d4879a9	Merge pull request #17920 from Anurag810/stock_balance_report fix: fetch item on the base of item group	2019-06-13 10:49:30 +05:30
Anurag Mishra	bbe2c4fb01	fix: fetch item on the base of item group	2019-06-12 19:09:51 +05:30
Rohit Waghchaure	3cf24366a9	feat: provision to set multiple manufacturer in the item master	2019-06-06 19:53:32 +05:30
Rushabh Mehta	6744febedd	Merge pull request #17769 from deepeshgarg007/dimensions feat: Configurable Accounting Dimensions	2019-06-03 17:00:58 +05:30
Nabin Hait	37fdeee367	Merge pull request #17805 from nabinhait/discount-rounding-adjustment-dev fix: Rounding adjustment while additional discount amount is applied on grand total	2019-06-03 13:09:04 +05:30
deepeshgarg007	2580075583	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-30 22:11:27 +05:30
Nabin Hait	1bb3fc3c19	Merge pull request #17789 from sunnyakaxd/patch-2 fix: Dont fetch all orders to update a few	2019-05-30 17:24:49 +05:30
Nabin Hait	4d58734492	fix: Rounding adjustment while additional discount amount is aplied on grand total	2019-05-30 15:51:29 +05:30
Anurag Mishra	62d58acea9	fix: Added description if item variants does not have description in map(v12) (#17796 ) * fix: variant item description based on attribute * style: removed unwanted changes	2019-05-30 14:04:08 +05:30
Himanshu Mishra	70029b818b	Update status_updater.py	2019-05-29 14:19:35 +05:30
deepeshgarg007	acc2422167	Merge branch develop into dimensions	2019-05-28 12:18:32 +05:30
Nabin Hait	ca8dae183a	Merge branch 'develop' into opening-stock-entry-dev	2019-05-27 11:50:16 +05:30
Nabin Hait	5cd04a6d30	fix: payment reconciliation against expense claim (#17729 ) * fix: payment reconciliation against expense claim * feat: Added dashboard for expense claim	2019-05-27 11:44:06 +05:30
deepeshgarg007	d330519f7c	fix: Merge branch develop into dimensions	2019-05-25 18:18:08 +05:30
Nabin Hait	8770ea2631	fix: Opening accounting entry for stock entry	2019-05-23 11:15:04 +05:30
deepeshgarg007	3d11ac0e75	fix: Accounting dimensions for child tables	2019-05-19 00:02:01 +05:30
Nabin Hait	3f119ec256	fix: GL Entry for opening stock reconciliation	2019-05-16 17:29:10 +05:30
rohitwaghchaure	d07a3e1de2	fix: limit offset was missing in the get_delivery_notes_to_be_billed method (#17611 )	2019-05-15 07:46:28 +05:30
deepeshgarg007	60f4dd0736	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-14 15:51:12 +05:30
rohitwaghchaure	39be1d43bc	Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount	2019-05-14 11:15:14 +05:30
deepeshgarg007	d83cf65be1	fix: Added dimensions in financial reports and general ledger	2019-05-12 18:34:23 +05:30
Rohit Waghchaure	4a267b9340	fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount	2019-05-09 19:52:53 +05:30
rohitwaghchaure	4d2c307d6d	Merge pull request #17475 from netchampfaris/item-variant-attributes-optional fix: Allow variant attributes to be optional	2019-05-09 00:54:45 +05:30
Faris Ansari	ab14892fc5	fix: Variant naming if optional attributes	2019-05-03 13:57:20 +05:30
Faris Ansari	cb03bb1c00	fix: Allow variant attributes to be optional	2019-05-03 13:41:50 +05:30
deepeshgarg007	bffa060ff6	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-05-01 16:33:11 +05:30
Nabin Hait	b8103ac077	Merge branch 'develop' into item-discount	2019-05-01 12:23:30 +05:30
deepeshgarg007	f2fb0e03e6	fix: Add status for partial received	2019-04-29 21:42:48 +05:30
deepeshgarg007	c23b70950e	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-04-26 16:43:06 +05:30
Nabin Hait	4a994d4eb8	fix: Don't allocate advance if pos	2019-04-25 17:49:38 +05:30
Nabin Hait	64bfdd9596	fix: test cases	2019-04-23 13:37:19 +05:30
Nabin Hait	593242fa5c	fix: Calculate rate based on discount on server side only if not rate or pricing rule applied	2019-04-23 13:22:38 +05:30
deepeshgarg007	06c20400ee	feat: Track purchase receipt status in Material Request	2019-04-22 12:25:14 +05:30
Mangesh-Khairnar	3ab2a18088	Merge branch 'develop' into so-on-hold	2019-04-11 15:49:06 +05:30
Faris Ansari	6472ed2c1e	Merge pull request #16941 from Mangesh-Khairnar/po-on-hold Feature: Purchase order on hold	2019-04-11 15:36:54 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
Nabin Hait	0f62b13dd8	Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items fix: sales return not working for product bundle items	2019-04-11 11:44:57 +05:30
Rohit Waghchaure	9665a531fc	fix: item variant test cases	2019-04-11 09:56:00 +05:30
Rohit Waghchaure	f3a9552e48	fix: item variant test cases	2019-04-10 17:57:09 +05:30
Anurag Mishra	ed82e8ba3b	fix: removed before from accounts_controlle.pyr and fetch the gl from frontend	2019-04-09 15:19:05 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
Rohit Waghchaure	3771db92b8	fix: sales return not working for bundle items	2019-04-06 17:34:40 +05:30
Rohit Waghchaure	9835c89e17	Added test cases	2019-04-06 12:29:05 +05:30
Mangesh-Khairnar	3d667b4c94	Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold	2019-04-05 12:11:26 +05:30
Nabin Hait	88f036a171	fix: Validate returned qty with ref qty considering field precision	2019-04-01 18:41:31 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
Saurabh	84a18f5b18	Merge branch 'master' into develop	2019-03-28 13:54:34 +05:30
Suraj Shetty	a7992ecb62	style: Fix formatting	2019-03-27 20:32:42 +05:30
Suraj Shetty	abc2a64d5e	fix: Commonify get gl_entry code by moving it to accounts_controller	2019-03-27 20:25:18 +05:30
Rohit Waghchaure	5816fc2801	Renamed subcontract to Send to Subcontractor	2019-03-26 12:52:49 +05:30
Mangesh-Khairnar	324e06cba0	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-03-25 18:51:13 +05:30
Mangesh-Khairnar	5e474f4664	fix: add server-side validation for closed sales order for linked material request	2019-03-25 17:28:20 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
Mangesh-Khairnar	439546c83c	feat: add on hold status in purchase order	2019-03-18 12:14:25 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
Rohit Waghchaure	6b33c9b934	fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-08 11:13:35 +05:30
Rohit Waghchaure	2bfb063fdb	fix(sales order item): not able to search item by description	2019-03-02 21:47:55 +05:30
Mangesh-Khairnar	86e650c1ed	feat: validate linked sales order on material request creation	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	5eb66aed77	feat: add on hold status check	2019-03-02 20:48:03 +05:30
Mangesh-Khairnar	e17b7095bf	feat(sales order on hold): check status of sales order to validate entry	2019-03-02 20:48:03 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
rohitwaghchaure	c18e925d61	fix: Moved regional methods from controller to hooks (#16736 )	2019-02-20 17:13:15 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Gaurav	f1e28e0e8d	mod(regional,italy): Updates to Italian Localization fixes: removed cleanup_files from italy/utils removed extract_doc_number from italy/utils added country filter to italian localization patch replaced dict assignment with dot operator in prepare_invoice correcions in e-invoice xml following changes in prepare_invoice added setup_report in patch added section for e-invoicing custom fields in company added Italy in test_company	2019-02-19 10:39:22 +05:30
Aditya Hase	13808b4cc9	fix(py3): Convert to float before comparison	2019-02-08 12:03:25 +05:30
Aditya Hase	d9ce732d3e	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Nabin Hait	d2e2ca31ac	Merge pull request #16460 from nabinhait/pricing-rule-issue fix: Enforce pricing rule based on rate on server side	2019-01-23 12:09:12 +05:30
Nabin Hait	fb8c0bd664	Merge pull request #16464 from adityahase/flakes style: Linting fixes	2019-01-23 12:08:57 +05:30
Nabin Hait	4ef578e1c4	Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports fix: Multiple fixes in the reports	2019-01-23 12:05:36 +05:30
Aditya Hase	f79937d64b	style: Remove unused imports	2019-01-23 00:28:37 +05:30
Nabin Hait	da32916396	fix: Enforce pricing rule based on rate on server side	2019-01-22 19:06:06 +05:30
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Rohit Waghchaure	f725816809	Enhance: Added field limit in the Payment Reconciliation to handle large entries	2019-01-17 12:54:14 +05:30
Nabin Hait	983d102a19	Merge branch 'staging-fixes' into Quality-inspection-fix	2019-01-16 17:52:30 +05:30
Sahil Khan	34766c0c50	BIS issue fixes	2019-01-16 15:59:39 +05:30
Saif Ur Rehman	5085673030	test: fix for Item Tax Template v12	2019-01-11 03:53:43 +05:00
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
Saif Ur Rehman	eb7277d2d4	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/patches.txt	2019-01-09 11:25:53 +05:00
Nabin Hait	bf0b6fd8a9	Merge pull request #16342 from finbyz/staging-fixes fix: rounded total if available while caclulating advance paid	2019-01-08 20:29:32 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Aditya Hase	0c16424d7d	fix(naming): Use creation instead of name to order SLEs	2019-01-08 00:09:36 +05:30
Sagar Vora	f5a00dc0c1	Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied	2019-01-07 15:45:33 +05:30
Sagar Vora	f733a39089	fix: remove trailing whitespace	2019-01-07 14:24:01 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
finbyz	5efc7973ea	Minor Fix for Rounded Total	2019-01-05 11:12:11 +05:30
Saif Ur Rehman	648bd15b2a	Force item_tax_rate on setting item details server-side	2019-01-03 04:03:54 +05:00
Anurag Mishra	0885485a61	changes	2019-01-01 15:00:16 +05:30
Anurag Mishra	0c8411d085	test cases sucess	2018-12-28 16:53:00 +05:30
deepeshgarg007	77cde832d6	Added validation for update items in purchase order as well	2018-12-27 15:56:51 +05:30
deepeshgarg007	ffb411d9e2	Validation while updating items in sales order	2018-12-27 14:12:05 +05:30
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
Rushabh Mehta	fafbb0278f	fix: reload parent after setting children	2018-12-24 22:09:15 +05:30
Rushabh Mehta	c9b1a35ac3	fix: set explicit idx for new item in update_child_qty_rate	2018-12-24 20:55:35 +05:30
Nabin Hait	5a9579bae4	feat(quality): Check quality status before receipt/delivery (#16169 )	2018-12-24 14:54:42 +05:30
Shreya Shah	d2b9093ecc	fix: Check if items exist (#16248 )	2018-12-24 14:21:07 +05:30
Rohit Waghchaure	f6f503a1f6	[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2018-12-19 15:15:35 +05:30
Stavros Anastasiadis	3d82b74ea4	Update Items in Submit state can add new row (#15644 ) * Update Items in Sumbit state can add new row In Sales Order and Purchase Order when docstatus is submitted user can use Update Item btn to add new child Items * Remove unused code line * Remove blocking db save thread line * Remove Company as not standard Field in Purchase Order Item * Minor indentation fix * Add Unit Test, add new row in update_child_qty_rate * Codacy fix	2018-12-10 17:30:55 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Nabin Hait	96598936ad	fix(test): Fixed tests for discount with margin and period closing voucher	2018-11-27 17:48:13 +05:30
Nabin Hait	e4cc062cf1	Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total [Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 13:22:50 +05:30
Nabin Hait	72fc1b57be	Merge pull request #16083 from Anurag810/new-fix-branch [fix] delivery note with quantity equal 0 #14211	2018-11-27 13:10:31 +05:30
Nabin Hait	6743219dc2	Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice [Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice	2018-11-27 13:09:16 +05:30
Rohit Waghchaure	6cc2f52fa4	[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 12:07:03 +05:30
Saif Ur Rehman	5fdbc68ca3	Set Gross Profit on server-side validation of Sales Order	2018-11-26 19:32:16 +05:00
Rohit Waghchaure	d1a85a3637	[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice	2018-11-26 18:42:29 +05:30
Anurag Mishra	e657fe84b8	making validation generic for sales order,sales invoice,purchase order etc.	2018-11-26 17:13:10 +05:30
Rohit Waghchaure	f4dc71661d	[Fix] Address not set from the API	2018-11-15 17:04:02 +05:30
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
Nabin Hait	367a076fa4	fix(discount): Fixed item discount amount calculation	2018-11-13 18:41:58 +05:30
Nabin Hait	688758a56f	fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-13 16:13:16 +05:30
Himanshu Mishra	35b2627112	Item qty based tax (CESS) calculation support (#15456 ) * fix conflicts * added test case for qty cess * use company specified in document to get region	2018-11-13 11:13:04 +05:30
Frappe Bot	1ff9c691b7	Merge branch 'staging' into develop	2018-11-09 10:21:07 +00:00
patilsangram	667f0fbd6d	[fix] Invoice/Delivery note customer po_no overwritten by Sales order null po_no (#15785 )	2018-11-08 12:51:41 +05:30
Zarrar	5be6d19f4d	[Minor] Display Discount Amount when Tax table is empty (#15812 ) * show discount amount even when tax table is empty * negate the value for discount while printing	2018-11-08 12:16:26 +05:30
Ameya Shenoy	c1231d65fd	Merge branch 'staging' into develop	2018-10-19 13:27:07 +00:00
Saif	3c9155e406	[Minor Fix] Force toggle display Net Total field when default taxes are fetched (#15532 ) * Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched * Prevent net_rate from becoming NaN * -Fixed problem that party_account_currency was not set in mapped document -Fixed problem that discount amount was not recalculated (in mapped document) -Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency	2018-10-18 17:57:56 +05:30
Ameya Shenoy	606c504f28	Merge branch 'staging' into develop	2018-10-15 12:25:03 +00:00
Shreya Shah	314c97cbf1	Fix for supplier quotation (#15659 )	2018-10-11 16:59:40 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Shreya Shah	785f1aa96d	fix(print): Update idx if grouping same items (#15647 )	2018-10-11 10:14:25 +05:30
Shreya Shah	2291323c65	fix(shipping-address-display): Fetch shipping address display as per the shipping address (#15643 )	2018-10-11 10:13:27 +05:30
Ameya Shenoy	f174c95d80	Merge branch 'staging' into develop	2018-10-07 06:24:12 +00:00
Shreya Shah	5615cb4735	Set default only if customer_address not found (#15605 ) * Set default only if customer_address not found * Similar fix for Purchase Invoice and shipping_address	2018-10-07 11:42:07 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Ameya Shenoy	7d929c508f	Merge branch 'master' into staging-fixes	2018-10-04 09:25:07 +00:00
Neil Trini Lasrado	55a53e0bec	Added ability to have a default return warehouse for Sales Returns (#15491 )	2018-09-30 21:22:50 +05:30
Suraj Shetty	4b404c4f1e	Avoid multiple escapes (#15509 )	2018-09-27 15:39:34 +05:30
Nabin Hait	c22ba2ec26	fix(sales return): validation message fix	2018-09-26 18:56:45 +05:30
Suraj Shetty	6ea3de9521	Fix quote issues (#15497 ) * Fix quotes issues * Remove frappe.db.escape - Handle escape in the update_linked_doctypes method	2018-09-26 18:15:53 +05:30
Nabin Hait	1e7c32b909	Payroll fixes and more (#15475 ) * fix(payroll): multiple minor fixes related to salary structure * Added GSTR-1 and GSTR-2 report in Accounts module page * delete asset movement records on cancellation of Purchase Receipt * Update consolidated_financial_statement.py * minor fix * minor fix * add filters on item prices report (#15495)	2018-09-26 18:01:00 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287 ) * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Faris Ansari	2ab6e0e39b	fix(translations): Replace translations by keyword with indexed version (#15426 ) * fix(translations): Replace translations by keyword with indexed version Keywords in the translation also gets translated which results in an error because python cannot find the key * Update buying_controller.py	2018-09-19 13:13:59 +05:30
Alchez	e52ae4eacb	[Fix] 'To Bill' status even if the amount is zero (#14784 ) * Fix 'To Bill' status even if the invoice amount is zero * Modify fix to only apply on Delivery Note documents	2018-09-06 18:27:06 +05:30
Bassam Ramadan	8d7c1868d6	fix for fields names at sales invoice return payments and verifying the payment amount (#15245 ) * fix for payments field names in sales invoice return * add verification for payment amount at sales invoice return adding verification to be sure the payment amount is negative at sales invoice return * correction for precision field name	2018-08-30 19:15:15 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Nabin Hait	6b539d65d7	Restored missing rounded_total fields	2018-08-29 12:41:23 +05:30
rohitwaghchaure	e33047250e	[Fix] Speacial character issue in searching project in sales invoice (#15220 )	2018-08-27 11:43:57 +05:30
Zlash65	4d462d637f	indentation fix	2018-08-21 18:19:26 +05:30
Rushabh Mehta	9a29bfa49e	fix(indentation): sales_and_purchase_return.py	2018-08-21 17:53:25 +05:30
Bassam Ramadan	1ff2315899	Trial balance and payable accounts reports and sales return fixes (#15000 ) * adding supplier type filter to payable accounts and payable accounts summary reports adding supplier type filter to payable accounts and payable accounts summary reports as customer group at receivable accounts and summary reports as its important and easier to put this filter * fix trial balance opening and closing values the removed mathematical operations was causing showing incorrect values at opening and closing columns where the total row was correct so the operation deleted to view the correct values to be equal to the total row and to stop confusing the user due to different values between the total row and the the values in front of each account * fix for supplier type filter field on payable accounts reports rename the supplier type filter field to supplier group in payable accounts and summary reports * fix for paid amount in returned sales invoice the current paid amount not change from source value if you deleted any item if the invoice contain for example 3 items and you only need to return on item the current steps is to open the original invoice and press on make return then you delete the unwanted items but in this case the paid amount will not change and you will get an alert from the system until you change it manually but with this modification it works very well. * fixing trial balance values and totals fixing trial balance opening and closing ( DR - CR ) values and totals	2018-08-20 17:58:28 +05:30
rohitwaghchaure	b800382abf	[Fix] Due to incorrect conversion factor user not able to make purchase return entry (#15163 )	2018-08-20 17:50:31 +05:30
Charles-Henri Decultot	bd06a5b0ee	Small python 3 compatibility correction (#15151 )	2018-08-16 10:32:49 +05:30
Rushabh Mehta	8705371ef0	fix(product-listing): fix variant selection in website	2018-08-16 09:22:45 +05:30
Nabin Hait	c35271aef5	fix(various)	2018-08-10 19:01:13 +05:30
Nabin Hait	6a5695fe17	minor fix	2018-08-09 11:30:21 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Nabin Hait	50238c3049	[optimize] tree conditions for pricing rule	2018-08-08 18:43:04 +05:30
Himanshu Mishra	859d942b22	Cached calls (#15109 ) * [optimize]: bin updates * [optimise]: use frappe.get_cached_value instead of get_value for item * [fix]: change db.get_cached_value to get_cached_value	2018-08-08 18:33:50 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
Doridel Cahanap	59e4c32e9f	Allow Disabling Batch and edit Validations (#15076 )	2018-08-06 14:45:18 +05:30
Jignesh Greycube	b2d16aca74	Updated Spelling Maxiumm to Maximum (#15090 )	2018-08-06 14:32:05 +05:30
rohitwaghchaure	ae4ff5a403	[Fix] In words showing grand total instead of rounded total (#15065 )	2018-08-01 18:09:51 +05:30
Nabin Hait	041a5c2d3b	Get Advances and auto allocate (#14970 )	2018-08-01 18:07:39 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874 ) * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
rohitwaghchaure	3ffe89659a	[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879 )	2018-07-13 17:40:48 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
Alchez	9155e40bc7	[Fix] Set default CF in case none exist (#14829 )	2018-07-09 16:57:42 +05:30
Alchez	8f2a0f3d79	[Fix] Incorrect assignment of Serial No in POS Invoice (#14772 ) * Fix incorrect assignment of serial no in Sales Invoice through POS * Add conversion factor to quantity check	2018-07-06 14:36:52 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631 ) * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	ea943c6fe4	[Fix] Due date validate issue in the POS (#14825 )	2018-07-06 12:28:58 +05:30
Ameya Shenoy	935f4a474b	Prevent creation of more than 500 item variants (#14790 )	2018-07-03 10:48:59 +05:30
Charles-Henri Decultot	6d97ab6f78	Make fields translatable (#14786 )	2018-07-03 10:32:53 +05:30
rohitwaghchaure	01fe4a3726	[Fix] Consider the cancelled purchase receipt in backflush raw materials (#14753 )	2018-07-01 16:41:39 +05:30
Rohit Waghchaure	ed71c36748	[Fix] Not able to save subcontracted purchase receipt	2018-06-28 18:36:35 +05:30
rohitwaghchaure	34c187706d	[Enhance] Added Budget exception approver role in company (#14645 ) * [Enhance] Added Budget exception approver role in company * Added test cases for budget	2018-06-25 10:31:08 +05:30
rohitwaghchaure	3a595d07d0	[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649 ) * [Fix] POS Closing Voucher, on save collected amount becomes zero * Added test cases for the POS Closing Voucher	2018-06-25 10:10:29 +05:30
rohitwaghchaure	d3fb0fbb20	Added test cases for asset accounting, asset value adjustment (#14572 ) * Added test cases for asset accounting, asset value adjustment * Accounting entry for the asset created manually * Added asset movement test cases and validation * Added validation to make asset from purchase receupt, invoice only	2018-06-22 15:40:59 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
Nabin Hait	0bef91c241	minor fix in item type validation	2018-06-18 17:41:27 +05:30
rohitwaghchaure	77a45b43aa	Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535 )	2018-06-15 18:03:31 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Nabin Hait	d1f40ad0b6	minor fix	2018-06-14 17:09:55 +05:30
Nabin Hait	b2d3c0f040	Update ordered qty in blanket order	2018-06-14 15:56:29 +05:30
Manas Solanki	2df1b31707	[minor] minor fixes along with the codacy	2018-06-14 15:55:38 +05:30
Manas Solanki	e5e87f7137	[feature] Blanket Order - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Rohit Waghchaure	0eef3f665d	[Fix] Travis for stock entry	2018-06-13 13:06:25 +05:30
Rohit Waghchaure	b6381c66d8	[Fix] Purchase receipt test cases	2018-06-12 13:54:40 +05:30
Rohit Waghchaure	647d595158	Code cleanup and fixes for the asset	2018-06-11 19:15:08 +05:30
Prateeksha Singh	ea7533fa75	[tax-breakup] store itemized tax by item_name when can	2018-06-11 13:31:33 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269 ) * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
rohitwaghchaure	50d8c4a10f	[Fix] Not able to save purchase invoice, due to invalid condition (#14355 )	2018-06-05 13:08:10 +05:30
rohitwaghchaure	2da6b3d628	[enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296 )	2018-06-05 13:06:52 +05:30
Zarrar	7c088ff623	dont validate items if item_code not found (#14344 ) item_code field is not set when created using invoice creation tool	2018-06-05 10:32:09 +05:30
Zarrar	fc03a0463c	[Fix] Validate items for saleable, purchaseable or subcontractable in transactions (#14316 ) * validate items to see if they are saleable * check if items are subcontractable or saleable * improvise name,error message and code Validate type function validates item if they are of proper type for that transaction and throws descriptive error.	2018-06-04 12:52:52 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250 ) * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114 ) * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
rohitwaghchaure	a8fb2db001	[Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed (#14230 )	2018-05-26 09:23:02 +05:30
Nabin Hait	33df0b4fbf	Test case fixes (#14219 ) * Test case fixes * fetch_from fixes	2018-05-26 09:09:02 +05:30
Nabin Hait	5f861756a2	Item Default fixes	2018-05-23 19:37:06 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
mnatalia	5f0e8d6e09	Added possibility to translate (#14173 )	2018-05-22 09:08:50 +05:30
Prateeksha Singh	984a7a7e61	[item-query] change order of description terms, name first	2018-05-17 17:29:36 +05:30
Rohit Waghchaure	992fb34c95	[Fix] Asset adjustment issues	2018-05-17 11:22:59 +05:30
Rohit Waghchaure	585945e65d	Allow to select Asset Received But Not Billed in expense account head	2018-05-17 00:23:27 +05:30
Rohit Waghchaure	2868840e6b	[Fix] Validation issue	2018-05-16 23:57:28 +05:30
rohitwaghchaure	4ea97c84ac	Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual [Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:21:20 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
Manas Solanki	5b93562ce3	create default on making of invoice	2018-05-16 17:44:51 +05:30
Manas Solanki	e3bb1d0e3b	more fixes for the item defaults	2018-05-16 17:14:59 +05:30
Manas Solanki	64614374d8	fix codacy	2018-05-16 13:00:56 +05:30
Manas Solanki	bbd8508783	optimize the patch	2018-05-16 13:00:56 +05:30
Manas Solanki	087a2259d9	update for default warehouse	2018-05-16 12:44:07 +05:30
Rohit Waghchaure	144e9b178a	Added project condition in budget validation	2018-05-16 12:15:57 +05:30
tundebabzy	ad08d4ce96	Ability to hold payment for disputed invoices #12048 (#13298 ) * add new fields to Supplier Master: - on_hold: To signal the Customer is blocked from completing certain transactions - hold_type: 3 options - All, invoices and payments * sanitize `on_hold` field input * show hold status in list view * add `release_date` field to Supplier Master: - specifies the date when transaction restraint will be removed * reset release date if supplier is not on hold * add validation to stop transactions when Supplier is blocked * add test cases * return empty list for outstanding references if supplier is blocked * block make button:payment if supplier is blocked * adjust test cases * PEP 8 clean up * more tests * adds new fields to Purchase Invoice: - release_date: once set, invoice will be on hold until set date - hold_comment: so user can add comment pertaining to why invoice is on hold * implement individual purchase invoice on hold logic * allow user to change release date * update manual * final cleanup including more validation and tests * update supplier manual * make default for release_date argument todays date * remove Auto Repeat added by mistake * add on_hold_field to purchase invoice * add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view * implement explicit payment hold in purchase invoice * update manual * add dialog for saving comment * bug fix, refactor, clean up * more test cases	2018-05-16 11:31:41 +05:30
Shreya Shah	1906cadd94	[Fix] Currency field in Pricing rule (#14004 ) * some minor changes * Set query for price list based on currency * Validate Price list with currency	2018-05-16 11:20:30 +05:30
Rohit Waghchaure	a02640e249	[Minor] Is fixed asset checkbox not set at server side if duplicate	2018-05-16 10:49:12 +05:30
rohitwaghchaure	f9fa588ddc	Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po [Enhance] Budget validation on material request, purchase order	2018-05-15 22:18:17 +05:30
Rohit Waghchaure	4d4fb6dcbc	[Enhance] Budget validation on material request, purchase order	2018-05-15 22:12:44 +05:30
rohitwaghchaure	c3b9eabe5e	Merge pull request #14048 from shreyashah115/exchange-rate [Enhancement] Buying and Selling checkboxes in Currency Exchange	2018-05-15 17:55:09 +05:30
Shreya	3f77852e93	Pass buying or selling as filter parameters Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.	2018-05-15 17:22:06 +05:30
Saurabh	62a59301ef	[fix] resolved merge conflicts	2018-05-15 13:02:40 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
rohitwaghchaure	7c6bef4905	Merge branch 'enterprise_sprint' into supplier-group	2018-05-14 20:39:01 +05:30
Rohit Waghchaure	d644e6da16	Code cleanup	2018-05-14 19:09:44 +05:30
Rohit Waghchaure	16bc853f6a	Reschedule for future depreciations and booked difference amount in accumulated depreciation account	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	aa7b434270	Create asset adjustment doctype, post gl entry for the asset	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	0ea6fe4397	Added new doctype Finance Book Detail in asset, asset category	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f2684ae83a	Commonify get_asset_category_account and get_fixed_asset_account method	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	af05995418	Asset accounting	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	c6deb13fb4	Added account fields in the company, fixes in auto creation of the asset from PR	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	ab84254188	Asset linked to purchase receipt and serial no	2018-05-14 19:07:39 +05:30
Faris Ansari	69b0535e10	[fix] Incorrect currency conversion in Itemised Tax Breakup (#14006 )	2018-05-14 14:19:31 +05:30
Zlash65	2e0809801d	controller and other changes	2018-05-14 11:45:38 +05:30
creador30	dae8f1b353	Search for item_code (#13912 ) Item query can be called from custom script to search for an additional field. In this case the item_name, item_group and item_description are still searchable, but not item_code. As the item code is a must have field in search results, I have added this to the non-changable search fields in this query.	2018-05-04 18:12:03 +05:30
Prateeksha Singh	a7c6ff8f3e	Merge pull request #13837 from shreyashah115/serial-batch-linking Serial No. and Batch No. linking	2018-05-02 15:11:19 +05:30
Saurabh	e85a43c1c6	Merge branch 'master' into develop	2018-05-02 14:48:10 +05:30
Faris Ansari	eae2ddac69	validate_conversion_rate in taxes_and_totals (#13880 )	2018-05-02 12:19:30 +05:30
Faris Ansari	30304e68ff	[fix] Current stock qty calculation in case of different UOM	2018-04-30 15:44:49 +05:30
Shreya	14bd43d5eb	minor changes	2018-04-30 15:30:42 +05:30
Saurabh	63590496c1	[fix] resolved merge conflicts	2018-04-25 11:32:54 +05:30
rohitwaghchaure	57914f140e	[HotFix] Taxes not adding in POS sales invoice (#13776 )	2018-04-24 19:19:47 +05:30
hiousi	38de994788	do not copy template description to variant if not in allow fields (#13726 )	2018-04-24 12:10:45 +05:30
Zarrar	0e3b000e81	sql syntax fix (#13529 )	2018-04-05 10:34:30 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Rushabh Mehta	d5f9ebd008	[optimize] item queries (#13480 )	2018-04-02 23:37:33 +05:30
Manas Solanki	a7f5589564	fix for the update button in the sales invoice (#13435 )	2018-04-02 10:32:00 +05:30
rohitwaghchaure	a3c3dec5a2	[enhance] Item Alternative (#13121 ) * [enhance] Item Alternative * Added two way provision in item alternative * Test Cases * documentation	2018-03-28 11:51:44 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
rohitwaghchaure	85f63a3866	[Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392 )	2018-03-27 11:31:44 +05:30
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
rohitwaghchaure	23fa8893a8	[Fix] Division by zero issue (#13362 )	2018-03-22 11:16:00 +05:30
rohitwaghchaure	93779c21a7	[Fix] Project not set in the stock ledger entry (#13357 )	2018-03-21 17:52:41 +05:30
Shreya	4d347b1ca0	travis fix	2018-03-19 17:31:19 +05:30
Shreya	f7b39438d2	travis fix	2018-03-19 14:19:55 +05:30
Nabin Hait	c8cd4ba6f7	Merge branch 'master' into develop	2018-03-15 12:38:43 +05:30
Nabin Hait	1e4cfb4bf5	Fixes in setting po nos manually in sales invoice	2018-03-15 12:27:24 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290 )	2018-03-13 15:46:59 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Shreya Shah	aa54d934b8	make stock qty negative (#13276 )	2018-03-12 15:23:28 +05:30
Nabin Hait	2c7a6e6b43	Reserve for subcontracting (#13195 ) * [fix] #8427 * review comments changes * Validation for reserved warhouse * code improvements * alignment * test case * message changes * default warehouse / remove validation / change sql * fix * patch * Fixed merge conflict * Fixes and cleanups of reserve qty for subcontracting * set from_warehouse only if purchase_order and purpose found (#12398) * [HotFix] Validation issue for subcontract stock entry (#12127) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py * Fixes and cleanups of reserve qty for subcontracting * patch fixed * Reload bin in patch * [fix] set source warehouse in stock entry for manufacture * [fix] #8540 * code alignment * code alignment * Move target warehouse validation to submit * validation code improvement * code changes for single stock entry * validation fix * call make_rm_stock_entry * remove old stock entry method/rewrite test case * Don't set bom_no against raw materials while trasferring items for sub-contracting * minor fix	2018-03-12 14:12:12 +05:30
rohitwaghchaure	12aa4265ff	Don't allow to set negative quantity if transaction is not return entry (#13255 )	2018-03-12 11:20:30 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
tundebabzy	e69747ca6d	[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243 ) * add mode of payment field to Payment Term * add mode of payment field to Payment Terms Template Detail * add mode of payment field to Payment Schedule * add mode of payment in `get_payment_term_details`	2018-03-09 12:23:53 +05:30
Achilles Rasquinha	87dab14576	removed has_key	2018-03-08 14:21:48 +05:30
Achilles Rasquinha	9050998e06	[FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:55:41 +05:30
rohitwaghchaure	bbd9b71547	Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043 )	2018-03-07 15:39:40 +05:30
Vishal Dhayagude	668ec25d19	Allow Item variant Rename (#13161 ) * [WIP] Item varient rename * [wip] Item Variant * [fix] Item Varient Rename * [fix] Item Attribution Rename * removed unwanted code	2018-03-07 15:31:08 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Manas Solanki	5fd7b3bb80	Fix status updater (#13033 ) * fix the status updater for multiple sources * patch for updating the status * patch for updating the sales order item * Update update_status_for_multiple_source_in_po.py	2018-03-05 11:28:29 +05:30
rohitwaghchaure	0df95fa781	Multi-UOM for sales/purchase return (#13132 ) * Multi-UOM for sales/purchase return * Update sales_and_purchase_return.py	2018-03-01 11:31:33 +05:30
rohitwaghchaure	db9fa78ee8	Do not validate payment schedule for POS (#13115 )	2018-03-01 10:32:29 +05:30
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128 ) * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
rohitwaghchaure	4e8fdf7b3f	[Enhance] Quality Inspection Template (#12988 ) * [Enhance] Quality Inspection Template * Test case and patch * Update make_quality_inspection_template.py	2018-02-22 11:03:48 +05:30
Shreya Shah	f718b0c0df	Currency filter in Pricing Rule (#11776 ) * added currency filter * modified files * pull margin only if currency matches * Renamed price to rate in pricing rule * fetch rate only if currency matches * rebase with develop * rebase with develop * patch to set currency in existing docs * currency field mandatory in pricing rule * modified test cases * rebase with develop * fixed test case	2018-02-20 11:26:46 +05:30
Nabin Hait	cc98d40ff7	Payment reco auto allocation and maintain same order of records (#12963 ) * Automatically allocate amount after selecting invoice against a payment entry * codacy fixes	2018-02-16 13:14:20 +05:30
Shreya Shah	3a9eec2e92	Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913 ) * pass bill_date as parameter and calculate due_date on that basis * calculate payment_schedule on the basis of bill_date if present else posting_date * add bill_date as an argument to get_party_details * pass bill_date on supplier trigger in purchase invoice	2018-02-16 13:05:21 +05:30
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
Achilles Rasquinha	56b2e12af8	Python 3 fixes [merge asap] (#12884 ) * Python 3 fixes * fixed compare	2018-02-13 14:42:40 +05:30
Nabin Hait	e21e59614f	Fixed merge conflict	2018-02-12 15:59:55 +05:30
sivankar	621740efd9	Enhancement and bug fix in batch (#12753 ) * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date	2018-02-12 14:33:40 +05:30
Fahim Ali Zain TP	277935be79	Deduct Rejected Item's Raw materials in SubContracting (#12837 ) * Deduct Rejected Item's Raw materials in SubContracting frappe/erpnext#12752 * Travis Build Fix	2018-02-12 11:59:07 +05:30
rohitwaghchaure	45ac31ab93	[Fix] Not able to save sales order (#12851 )	2018-02-12 11:27:37 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
Faris Ansari	6041f5cb8c	[hotfix] Advance Total validation	2018-02-08 13:33:52 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Rohit Waghchaure	e8d22bb999	[Fix] Incorrect change amount if enabled rounded total	2018-02-05 18:13:29 +05:30
joezsweet	2f7ab065fb	- removed barcodes from force_item_fields	2018-02-05 11:54:32 +01:00
Vishal Dhayagude	cce29fabf4	[fix] validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry (#12767 )	2018-02-05 12:25:51 +05:30
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Nabin Hait	7918b92d95	Invalid date value comparison, fixes for mariadb 10.2.3+	2018-01-31 15:30:03 +05:30
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
Nabin Hait	cfa9d1adb7	Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685 ) * Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date * Payment Terms patch for credit days defined in customer group	2018-01-29 16:07:21 +05:30
Saurabh	fb2f97391f	resolved merge conflicts	2018-01-24 11:24:10 +05:30
Shreya	a137fe82a1	fix error message	2018-01-23 11:00:58 +05:30
Saurabh	ef31637549	Merge branch 'master' into develop	2018-01-22 15:29:15 +05:30
Rohit Waghchaure	c4c2bf0bfb	[Fix] Image patch showing in the item link	2018-01-22 13:47:28 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
rohitwaghchaure	da941af687	Set due date in purchase invoice based on suppler invoice date (#12395 )	2018-01-17 16:23:04 +05:30
Saurabh	4b0dd8a159	Merge branch 'master' into develop	2018-01-15 18:36:35 +05:30
Nabin Hait	a2426fcc9e	Get default tax template only if tax template not selected or template is for other company (#12492 )	2018-01-15 17:45:46 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
rohitwaghchaure	9fbed5617f	[Fix] Wrong batch showing in the popup (#12421 )	2018-01-12 16:22:33 +05:30
tundebabzy	76dddbf26e	Merge branch 'develop' into multi-barcode	2018-01-10 21:49:27 +01:00
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +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	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
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	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	96b264b314	Minor fixes	2018-01-02 11:50:29 +05:30
rohitwaghchaure	fe22686a8f	Update last purchase rate from the purchase invoice (#12189 )	2017-12-28 16:11:27 +05:30
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
Nabin Hait	e591c85f7c	Payment schedule total amount validation considering write off amount	2017-12-21 11:47:08 +05:30
Nabin Hait	2f9f4f9c01	Multiple fixes related to payment terms (#12115 )	2017-12-20 12:24:59 +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
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
rohitwaghchaure	9b8e1cb10e	[Fix] Payment terms validation issue (#12092 )	2017-12-19 11:20:29 +05:30
Nabin Hait	9771b9376d	Merge branch 'master' into develop	2017-12-15 12:53:56 +05:30
rohitwaghchaure	ce8adecbad	Incoming rate fixes (#11986 )	2017-12-15 12:13:50 +05:30
Vishal Dhayagude	d377018695	[fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001 ) * [wip] shipping rule * [wip] Shipping Rule tax auto calculate * [wip] Shipping Rule * [new] Shipping charges change on different triggers * [minor] Removed unnecessary comments * [fix] Minor Changes in function calls	2017-12-14 18:06:02 +05:30
Nabin Hait	aaf378e340	Validate numeric attribute value based on range defined in template (#11981 )	2017-12-13 18:40:52 +05:30
Nabin Hait	0f97eda7c9	Merge branch 'master' into develop	2017-12-12 19:17:53 +05:30
Nabin Hait	af9bdfeaa3	Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation (#11965 )	2017-12-12 18:50:05 +05:30
rohitwaghchaure	4e17fae63b	[enhance] UAE/KSA VAT/Excise implementation (#11923 )	2017-12-12 14:40:52 +05:30
rohitwaghchaure	efbc0667ec	[fix] On change of payment terms template, not fetch respective schedule data (#11928 )	2017-12-11 14:54:20 +05:30
rohitwaghchaure	505661b5c0	[fix] Wrong company's default tax fetch (#11927 )	2017-12-11 14:52:28 +05:30
Giovanni	ff7d73e418	- query fix	2017-12-10 20:46:46 +01:00
Giovanni	2144e02d3c	- Added multiple barcode feature per item	2017-12-10 17:27:09 +01:00
vwithv1602	78d5ccf5fc	Invalid return against purchase invoice Error - Issue#11834 (#11835 )	2017-12-04 11:16:34 +05:30
pawan	14d570ed9e	fix	2017-11-30 18:41:09 +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
pawan	e4aaff6686	message changes	2017-11-30 15:49:54 +05:30
Vishal Dhayagude	d42242df22	[Feature] Shipping Rule Calculation based on Net Weight (#11770 ) * [new] Calculate shipping tax based on weight * [fix] Change field name weight to weight_per_unit in SI Item * [new] Shipping Rule based tax for selling module * [new] Shipping rule based on weight added to Buying module * [fix] Conflict in jsons * [fix] Removed Redudant add_fetch * [fix] Codacy fixed * [fix] Print hide added	2017-11-29 16:09:59 +05:30
tundebabzy	2a4fefc6ff	Auto fetch batches based on quantity on POS (#11004 ) (#11767 ) * prevent premature escape when item has serial no and batch no * fetch actual_batch_qty for item * add available_qty to dialog * remove expired batches from drop-down * Update queries.py	2017-11-29 10:53:09 +05:30
pawan	54465f5df1	review comments changes	2017-11-29 10:18:38 +05:30
Rohit Waghchaure	52bf56d415	[fix] payment terms test case	2017-11-27 11:43:52 +05:30
rohitwaghchaure	373b5702a9	[fix] Server test cases (#11727 )	2017-11-27 11:27:28 +05:30
Saurabh	ed4191ec5b	[fix] merge-conflicts	2017-11-22 18:01:56 +05:30
Nabin Hait	02ac901345	[fix] Rounding adjustment in company currency	2017-11-22 16:12:20 +05:30
rohitwaghchaure	4dc5f0efaf	[Fix] Item details not fetching if item has no default bom (#11688 )	2017-11-22 15:21:47 +05:30
Nabin Hait	32a62a02df	Fixed merge conflict	2017-11-21 20:18:03 +05:30
Nabin Hait	0551f7bb00	Cleanup and fixes of payment terms feature	2017-11-21 19:58:16 +05:30
Rushabh Mehta	30dc9a14c6	[feature] [refactor] Shipping Rule for Buying + Refactor (#11628 ) * Shipping rule for Buying * [refactor] shipping rule	2017-11-17 14:31:09 +05:30
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Nabin Hait	877e1bb377	Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542 )	2017-11-17 12:27:43 +05:30
Prateeksha Singh	8f43d2514c	Multiple variant creation dialog (#11608 ) * Multiple variant creation dialog * variant dialog codacy fixes * [multiple variants] show_alert, and other minors	2017-11-16 18:06:26 +05:30
Rushabh Mehta	d3f5d0961a	[feature] Opening Invoice Creation Tool (#11589 ) * [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices * [minor] added progress bar while creating invoice * [minor] allow bulk upload for the invoices * [minor] calculate item rate from net total * [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0 * [minor] check mandatory values before making opening invoices * [minor] enable primary button if there is any error while creating invoices * [minor] minor fixes, set company currency as invoice currency added tests * [dashboard] added Opening Invoice Summery section in Dashboard * [minor] added total invoices count on dashboard * [minor] don't show dashboard if there are no opening invoices available * [minor] added Opening Invoice Tools to Account's Tools section * [minor] codecy fixes * [fix] refactored general ledger and buttons on charts * [fix] tests	2017-11-15 16:29:53 +05:30
Shreya Shah	be690ef817	Rate with margin in customer and company currency (#11437 ) * field for company margin * added base_rate_with_margin * calculate company margin * test for item price * test for delivery note * test for sales order * test for quotation * test for sales invoice	2017-11-14 17:22:41 +05:30
Rushabh Mehta	d5c6416d91	[new feature] Product Configurator (via Item Quick Entry) (#11535 ) * [Feature] Item Variant Creation from Quick Entry * [minor] formatted js * [minor] set 3 attribute per page instead of 5 in template * [fix] fixed codecy issue * [fix] label translation * [minor] changed trigger event of item template * [fix] moved item ui tests under stock * [UI test] added test for item attribute * [UI test] added test for creation of item variant from quick entry * [fix] item variant ui test fixes * [wip] * [cleanup] item quick entry * [remove] tests, fixtures were missing * [refactor] use set_only_once in item	2017-11-14 15:27:28 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Rushabh Mehta	98aa581864	[fix] default tax only on insert (#11544 ) * [fix] default tax only on insert * [fix] default tax only on insert * [fix] default tax only on insert	2017-11-14 09:32:32 +05:30
Saurabh	022ab63a0f	[fix] query param fixes	2017-11-10 15:06:02 +05:30
Faris Ansari	99e31f97b8	set default params for paging (#11500 )	2017-11-10 10:50:49 +05:30
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Nabin Hait	82c9352d53	Update variant description based on attribute if not already there (#11302 )	2017-10-25 11:46:20 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
Saurabh	a7d5f94d4a	[fix] Do not append description to variant if description already exists (#11204 )	2017-10-18 16:02:08 +05:30
Rushabh Mehta	bc4e2cd9c1	[added] hospitality domain (#11020 ) * [added] hospitality domain * [tests] wip * [tests] for restaurant * [fix] tests for new naming * [docs] added restaurant docs * [docs] added restaurant docs	2017-10-17 12:30:34 +05:30
tunde	d82677f1e6	Merge branch 'develop' into payment-terms	2017-10-06 02:23:45 +01:00
Nabin Hait	5a834209d0	Cleanup of PO schedule date pull requests	2017-10-05 19:51:10 +05:30
tunde	19e63b73ed	Merge branch 'develop' into payment-terms	2017-10-03 12:02:38 +01:00
Nabin Hait	7eba1a35d3	Controller init args fix (#11015 ) * Controller init args fix * cleanup useless code	2017-10-02 15:59:27 +05:30
Nabin Hait	01b96a0e31	Fixes for uom in get_item_details	2017-09-29 18:57:41 +05:30
Nabin Hait	79a1d2a3b0	Fixes for uom in get_item_details	2017-09-29 18:15:40 +05:30
tunde	c49e748c85	Merge branch 'develop' into payment-terms	2017-09-29 13:30:22 +01:00
Rushabh Mehta	912ae24ca2	Merge branch 'master' into develop	2017-09-29 16:22:02 +05:30
Rushabh Mehta	80d24f83f8	[fix] item variant description	2017-09-29 15:39:03 +05:30
tunde	25275077ab	Merge branch 'develop' into payment-terms	2017-09-29 10:47:01 +01:00
Nabin Hait	945f502748	Fixes for updating item variant from template (#10975 ) * Fixes for updating item variant from template * More fixes for test cases	2017-09-29 15:11:50 +05:30
tunde	3415ac6e9c	Merge branch 'develop' into payment-terms	2017-09-29 10:10:24 +01:00
Nabin Hait	c314485d55	Fixes based on test case	2017-09-28 18:55:49 +05:30
tunde	9bed2de726	show all duplicate rows after checking for duplicate due date	2017-09-25 10:19:35 +01:00
tunde	e52bb825ec	fix bug: form is always dirty	2017-09-25 09:02:23 +01:00
tunde	77ecacc379	validation to check for possible duplicate payment terms	2017-09-22 23:12:55 +01:00
tunde	3aec78b472	make due date, invoice_portion mandatory	2017-09-22 16:22:15 +01:00
tunde	62af5c5693	more validation checks and test fixes	2017-09-22 15:16:38 +01:00
tunde	82de375ba0	Merge branch 'develop' into payment-terms	2017-09-21 11:21:05 +01:00
Rohit Waghchaure	0e28fccb34	[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated	2017-09-21 15:41:57 +05:30
tunde	3387d026b1	Merge branch 'develop' into payment-terms	2017-09-19 18:07:12 +01:00
Nabin Hait	2e4de83df6	Rounding Adjustment via a separate field, instead of last tax row (#10659 ) * Rounding Adjust via a separate field, instead of last tax row * Fixed test cases	2017-09-19 14:53:16 +05:30
Nabin Hait	bd4b80e3d8	Merge branch 'master' into develop	2017-09-19 12:05:41 +05:30
tundebabzy	f6d738b3c5	Delivery note to billing issue (#10726 ) (#10766 ) * allow invoices to be made from sales returns * Update queries.py	2017-09-18 17:10:09 +05:30
tunde	9448f4b13c	codacy corrections	2017-09-18 12:08:34 +01:00
tunde	4bf3ed47ff	revert from trying to adjust payment schedule based on old recurring_document	2017-09-18 11:54:28 +01:00
Saurabh	d7e1869a70	[fix] if item code not exists then exclude item in validate_selling_price (#10800 )	2017-09-18 15:43:35 +05:30
mbauskar	ea832b8157	resolved merge conflicts	2017-09-14 15:32:10 +05:30
Nabin Hait	45dce89cae	Print Settings for printing taxes with zero amount (#10782 ) * Print Settings for printing taxes with zero amount * added __init__.py file to patch module v8_9	2017-09-14 15:17:38 +05:30
tunde	1255aa0f11	Merge branch 'develop' into payment-terms	2017-09-12 11:54:52 +01:00
tunde	ecb118fb3b	bugfix: call `set_payment_schedule` only in relevant doc	2017-09-11 15:45:10 +01:00
tunde	df3a175974	fix bugs: add `payment_schedule` if `payment_terms_schedule` specified	2017-09-11 11:02:57 +01:00
mbauskar	dfeadf876e	Merge branch 'master' into develop	2017-09-10 12:32:21 +05:30
Makarand Bauskar	80b2ba2b9a	[hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725 ) * [hotfix] dont allow guest user to list the invoices or orders * [hotfix] fixed Not Permitted issue for System user while accessing documents on portal * [codecy] removed trailing whitespace * [fixes] added filters for supplier in RFQ and other minor fixes	2017-09-10 12:04:28 +05:30
tunde	96b8f223fd	fix failing tests	2017-09-08 15:35:59 +01:00
tunde	ad7d3a1733	Merge branch 'develop' into payment-terms	2017-09-07 13:13:59 +01:00
rohitwaghchaure	166b78f022	[Enhance] Subscription module (#10089 ) * [Enhance] Subscription module * Added view documents from the subscription form * Test cases * documentation * UI Test cases, fixes * Removed child table in the subscription * Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow * added patch to make subscription from the recurring data * Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller * renamed subscription_id to subscription	2017-09-07 16:14:22 +05:30
tunde	32aa7c1e68	Automatically set payment schedule if not specified - fix failing test cases - fix failing tests for recurring documents - others	2017-09-07 06:52:15 +01:00
tunde	a19ea6e2f3	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms	2017-08-29 15:26:50 +01:00
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
Nabin Hait	caab582943	Tax breakup for actual amount and fixes in itemised purchase register (#10515 ) * Tax breakup for actual amount and fixes in itemised pur register * Rounding of itemised tax breakup amount	2017-08-24 16:22:28 +05:30
Rushabh Mehta	7e506af0b9	[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 (#10538 )	2017-08-24 15:23:33 +05:30
tunde	f7e87e66ee	do correct gl entry for debit and credit notes	2017-08-23 22:36:25 +01:00
tunde	fb144303f5	codacy and typo fixes	2017-08-20 17:23:55 +01:00
tunde	be1b871c53	modify validation if doc has payment term schedule	2017-08-20 17:22:59 +01:00
tunde	4c5efa3dec	renames `set_payment_schedule` and removes it from validation	2017-08-20 17:22:06 +01:00
tunde	43870aa8db	moves `set_payment_schedule` and `validate_payment_schedule` to accounts_controller	2017-08-20 16:56:43 +01:00
Nabin Hait	9275969b51	Payment Terms: doctypes, schedule, payments and more fix payment terms template setup: - add_fetch to correct credit_days and credit_months not credit_days_months fixed bug in `make_customer_gl_entry` and `make_supplier_entry: all sales invoice were failing because they were all attempting to make gl entry from payment schedule. Same with purchase invoices	2017-08-20 16:51:29 +01:00
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
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
Doridel Cahanap	96e52be5f1	[Enhancement] Allow Sidebar Menu record search using text from Item Name of a record (#10324 ) * Search Record in Sidebar Menu Using Item Name for Order Page * Test Case to create 2 Quotations with different Items	2017-08-08 17:12:50 +05:30
mbauskar	ee090a9a3c	Merge branch 'master' into develop	2017-08-02 18:18:14 +05:30
Makarand Bauskar	ce436b7698	[minor] set description to '' if template description is not available (#10244 )	2017-08-02 18:16:53 +05:30
Nabin Hait	cd95134267	Rounding issue in tax calculation (#10135 ) * Adjust rounding loss of discount in the last item row. Fixes #8952 * Fixed rounding issue in tax calculation. Fixes #8953, #8952, #8893, #6954, #8910 * Rounding related fixes for purchase cycle	2017-07-31 18:07:45 +05:30
mbauskar	8b6f7914b0	resolved merge conflicts	2017-07-31 12:30:53 +05:30
Nabin Hait	495ef67caa	Added delivery date in SO parent form. Fixes #10104 (#10155 ) * Added delivery date in SO parent form. Fixes #10104 * UI tests for sales order delivery date	2017-07-31 11:25:51 +05:30
KanchanChauhan	58c9934452	[fix] company graph based on base currency (#9950 )	2017-07-26 18:17:11 +05:30
rohitwaghchaure	49a6b4a4fa	[Fix] RFQ list showing to all supplier in the portal (#10023 )	2017-07-25 14:12:58 +05:30
KanchanChauhan	4b888b95d0	[Minor] Added filter condition to Customer Query (#10057 )	2017-07-25 14:03:01 +05:30
mbauskar	0e6933a1e8	resolved merge conflicts	2017-07-20 14:19:47 +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	8e0f23efc7	Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933 ) * Multiple delivery dates in Sales Order and make DN based on selected delivery dates * Test case and some other minor fixes * Updated docs for multi delivery date * removed the trailing whitespace * removed the trailing whitespace * removed trailing whitespace	2017-07-20 10:30:59 +05:30
Nabin Hait	f37d43d0c1	Remove newline from serial no values	2017-07-18 12:15:16 +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
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
Rohit Waghchaure	296fbfeaac	[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice	2017-07-10 23:06:49 +05:30
Nabin Hait	fbb5945ff3	Fixed itemised tax calc to fix pos loading	2017-07-07 12:58:22 +05:30
Nabin Hait	f3f0dfef2a	Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658 ) * Invoice copy, state code in gst print format, hsn code in other sales/purchase docs * Formatted Net Amount in item-tax-breakup * GST print format fixes * removed trailing whitespace * removed trailing whitespace	2017-07-06 14:49:34 +05:30
Nabin Hait	852cb64e4f	GST tax invoice print format and more (#9616 ) * GST Tax Invoice print format and more. Fixes #9545 #9566 #9608 * Reload gst print format only for Indian users * Fixes as Codacy	2017-07-05 12:58:19 +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
Makarand Bauskar	1bad1fcc00	Merge pull request #9452 from faztp12/develop Customer Query include Search fields	2017-07-03 15:20:23 +05:30
rohitwaghchaure	69279229cc	Merge pull request #8987 from bcornwellmott/bom_convert_uom Added BOM UOM selection for items	2017-06-28 16:28:31 +05:30
Console Admin	8623166dca	Customer Query include Searchfields frappe/erpnext#8821	2017-06-23 20:32:52 +03:00
Rohit Waghchaure	e9ff1914fc	Added is_perpetual_inventory_enabled method	2017-06-20 11:26:37 +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
bcornwellmott	6561b8ade9	Merge branch 'develop' into bom_convert_uom	2017-06-16 08:29:00 -07:00
tundebabzy	9a3462031d	[UX] Error in purchase transaction - Ignore instead of Prompt #7766 (#9329 ) * sets tax category to "Total" if all items are non-stock items * makes notification message translatable and removes multi-line string * Update buying_controller.py	2017-06-16 15:30:14 +05:30
Rushabh Mehta	c8a0de5e59	Revert "sets tax category to "Total" if all items are non-stock items (#9295 )" (#9320 ) This reverts commit `476c4fec1d`.	2017-06-16 11:18:23 +05:30
tundebabzy	476c4fec1d	sets tax category to "Total" if all items are non-stock items (#9295 )	2017-06-16 11:17:40 +05:30
Rushabh Mehta	e0434ad40e	Merge branch 'develop' into bom_convert_uom	2017-06-15 17:32:27 +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
Sagar Vora	847444724b	remove bracket (#9284 )	2017-06-14 15:51:47 +05:30
Sagar Vora	d19c2e2e93	[minor] Check if item is stock item before validating Warehouse while Purchase Return (#9282 ) * Check if item is stock item before validating Warehouse * changed logic to decide warehouse_mandatory	2017-06-14 15:39:41 +05:30
bcornwellmott	5491275b66	Merge branch 'develop' into bom_convert_uom	2017-06-07 08:42:54 -07:00
tundebabzy	99b734bfd7	Fix #4587 : Status does not display "Pending" in report filter (#9104 ) * adds Material Request to `status_map` * updates eval condition for Partially Ordered in Material Request map * changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options * adds more options to `validate_status` * adds `set_status` just before saving * adds `check_for_closed_status` in `before_cancel` * adds patch to convert status to material request specific status * adds stricter status update conditions * changes `update_status` to me `set_status` * adds checker such that draft status can only change to pending * renames `check_draft_status` to `status_can_change` * adds Cancelled to Material Request map * makes `status_can_change` block any attempt to change a cancelled document * adds more test cases * updates what `set_status` checks for before adding comment * adds patch to rename the present material request status	2017-06-07 12:02:07 +05:30
Nabin Hait	e4b3a67e74	Rate validation in return entry	2017-06-01 16:47:45 +05:30
Nabin Hait	ac3b2aa913	Set change amount automatically only if it is a cash transaction (#9065 )	2017-05-30 15:35:01 +05:30
Nabin Hait	6a5cf672c1	Fixed opportunity status (#9062 )	2017-05-30 15:34:20 +05:30
Ayush Shukla	e9cf1aba77	added float and rebase with hotfix (#9019 )	2017-05-25 14:14:55 +05:30
Ben Cornwell-Mott	0f0b121669	Added BOM UOM selection for items Added patch for BOM Item UOM Fixed scrap qty issue Added Scrap Qty update to patch Reverted test record for production order	2017-05-24 11:12:51 -07:00
Prateeksha Singh	89cec18467	set variant name based on template name (frappe/erpnext#6367) (#8920 )	2017-05-19 12:35:36 +05:30
Nabin Hait	83f8344e62	Merge branch 'master' of github.com:frappe/erpnext into hotfix	2017-05-18 14:06:37 +05:30
Nabin Hait	ee59ecd396	Merge branch 'hotfix' of github.com:frappe/erpnext into hotfix	2017-05-18 14:06:06 +05:30
Nabin Hait	e4f80a6eaa	Open lost opportunity again if quotation made against it (#8854 )	2017-05-17 19:41:39 +05:30
Nabin Hait	1e2d7b3519	Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice (#8882 )	2017-05-17 13:52:21 +05:30
Nabin Hait	8a27cf3785	Fix status of invoices with negative outstanding, if no return entry (#8829 ) * Move allowance field in Item to the first section to apply it for both stock and non-stock items * Fix status of invoices with negative outstanding, if no return entry * get_value included in safe_eval	2017-05-16 12:43:00 +05:30
rohitwaghchaure	73456ac81a	[fix] Payments on the invoice is showing even if IS POS option is disabled (#8802 )	2017-05-16 11:29:57 +05:30
Prateeksha Singh	edeb4dc7e0	Multiselect dialog for getting items (#8583 ) * Concatenate docnames and send to mapper * Multiselect with checkboxes * set setters as separate filters * Map filter fields to target_doc * Get items from quotation (in SO) working * [major] Set dialog setters for all forms * Add date field * Specify non-default date_fields * [minor] add test_mapper.py * [minor] remove cur_frm * [minor][fix] test * [minor] fix test with make_test_records	2017-05-15 11:32:06 +05:30
Nabin Hait	4f5ad50ecf	Item Rate in Sales Return must be less than or equal to reference doc (#8775 ) * Item Rate in Sales Return must be less than or equal to reference doc * Fix as rate field is not there in Packed Item	2017-05-11 16:44:19 +05:30
Makarand Bauskar	0e4c5c9efb	[minor] renamed a Total Margin field to Rate With Margin (#8720 ) * [minor] renamed a Total Margin field to Rate With Margin * [minor] minor fixes in field lable	2017-05-11 11:40:02 +05:30
Nabin Hait	4e6ff8ccd8	Ignore permission for Bin in warehouse query (#8742 )	2017-05-09 15:09:10 +05:30
Rushabh Mehta	b7e740ff45	[minor] ignore permissions for bin on warehouse_query (#8713 )	2017-05-06 12:44:03 +05:30
Nabin Hait	42343bbc2c	Selling price validation against last purchase rate / valuation rate (#8702 )	2017-05-05 17:23:17 +05:30
Nabin Hait	b6a8920489	Fixed conflict	2017-04-28 09:58:41 +05:30
Rushabh Mehta	551406ab11	[enhance] automatic batch selection in Delivery Note and Stock Entry	2017-04-24 10:28:38 +05:30
Rushabh Mehta	e385b5b97b	[enhance] automatic batch creation, move and split	2017-04-24 10:28:38 +05:30
mbauskar	8f3cc81302	[minor] minor fixes in pricing_rule and set_missing_value	2017-04-19 21:05:37 +05:30
mbauskar	9e9d242a24	[minor] fixes in test cases and added the test case for multiple uom in selling	2017-04-19 21:05:37 +05:30
mbauskar	287fe81329	[minor] calculate price list rate based on items uom	2017-04-19 21:05:37 +05:30
Rohit Waghchaure	dc981dc546	[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue	2017-04-17 17:31:32 +05:30
Javier Wong	54d9c9eaf4	Merge branch 'develop' into develop	2017-04-14 18:33:44 +08:00
Javier Wong	9b11d9b45d	[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-14 18:24:04 +08:00
mbauskar	e471b02172	[minor] if packed item warehouse not found then set the parent item warehouse to packed items	2017-04-12 18:51:01 +05:30
Makarand Bauskar	141c244ece	[minor] added order by args to get_*_list methods (#8413 )	2017-04-12 13:02:28 +05:30
Rohit Waghchaure	87ad6d074a	[enhance] Stock qty added in purchase invoice	2017-04-11 18:29:52 +05:30
Makarand Bauskar	4782e8b751	[minor] added safe_eval for status_updater and added getdate and nowdate (#8365 )	2017-04-07 17:16:16 +05:30
Rushabh Mehta	b58979fd3e	[added] frappe.safe_eval	2017-04-06 18:58:39 +05:30
Rushabh Mehta	9365641777	[added] frappe.safe_eval	2017-04-06 18:24:34 +05:30
Nabin Hait	d681c88d79	validate returned qty only if there is reference qty	2017-04-06 15:20:45 +05:30
Rohit Waghchaure	faf51d91b6	[fix] stock qty issue in purchase trends report	2017-04-05 14:53:26 +05:30
Nabin Hait	6f038bc1f3	Validate total advance against grand total considering write off amount	2017-04-03 17:56:05 +05:30
Nabin Hait	9300013acc	Validate total advance against grand total considering write off amount	2017-04-03 17:35:58 +05:30
Nabin Hait	8d8cba7faa	Validate total advance against grand total considering write off amount	2017-04-03 17:26:32 +05:30
Rushabh Mehta	cc8b2b2fdb	[fix] [refactor] demo for v8 and remove purchase common	2017-03-31 17:36:48 +05:30
Dominik Ottenbreit	6eb202ef3a	fix patch after test, fix variant based on manufacturer, add json for item_manufacturer	2017-03-24 14:49:52 +01:00
Nabin Hait	4a8a62a202	Merge pull request #8053 from umairsy/video-pages updated erpnext-learn pages	2017-03-23 17:02:34 +05:30
Rushabh Mehta	a07c43fd68	[feature] ability to have variants based on manufacturer	2017-03-21 17:48:34 +01:00
Umair Sayyed	024896d806	updated erpnext-learn pages	2017-03-17 12:55:01 +05:30
Nabin Hait	56f650f342	Merge branch 'master' into develop	2017-03-15 11:28:07 +05:30
Rushabh Mehta	82c258948d	[fixes] for recurring and tests	2017-03-14 19:13:39 +05:30
Rohit Waghchaure	11fa7a9311	[fix] Removed customer, supplier and added link_name from website_list_for_contact file	2017-03-14 13:26:10 +05:30
Saurabh	4f4d0a8369	[fix] validate negative quantity while creating purchase receipt	2017-03-13 15:37:47 +05:30
Rohit Waghchaure	0169341917	[Fix] Item variants broken when using naming series for items and vriants of numeric value	2017-03-10 19:40:08 +05:30
Nabin Hait	e68f32cf19	UOM Conversion in selling	2017-03-06 16:41:13 +05:30
Kanchan Chauhan	5a980ac87a	UOM Conversion in Selling	2017-03-06 16:41:12 +05:30
Nabin Hait	a07c3193cf	Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos [Fix] Sales Return Invoice (Is POS) doesn't show correct payment data	2017-03-04 18:32:40 +05:30
Rohit Waghchaure	a31ffbc745	[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data	2017-03-03 16:28:49 +05:30
Nabin Hait	2bcacec5c6	Merge pull request #7576 from RobertSchouten/compact_dev [fix] compact print format not longer ignores format builder	2017-02-24 13:09:18 +05:30
Nabin Hait	cd837ecbac	Merge branch 'develop' into develop	2017-02-20 19:09:20 +05:30
Nabin Hait	9f4cb0c097	Fixed merge conflict	2017-02-20 15:00:04 +05:30
Rohit Waghchaure	4b9d2f2733	[Fix] Cleanup supplied items if supply raw material is set as No	2017-02-16 18:53:23 +05:30
suyashphadtare	34ab136b46	[fix] Remove un-necessary Whitespace	2017-02-10 19:14:43 +05:30
suyashphadtare	750a067688	[minor][fix] Show all warehouses with item actual qty in warehouse set query	2017-02-10 19:14:43 +05:30
suyashphadtare	049a88cc40	[minor] Show item quantity in warehouse set query	2017-02-10 19:14:43 +05:30
Nabin Hait	6ff0caa87a	Fixed merge conflict	2017-02-08 11:33:33 +05:30
Nabin Hait	0a6aaf4257	Get standard/historical valuation rate where missing: some minor fixes	2017-02-07 12:50:22 +05:30
Nabin Hait	ea8fab52c6	Get standard/historical valuation rate where missing, if item is not a sample item	2017-02-07 01:24:32 +05:30
Rushabh Mehta	a3d0bea375	Merge branch 'develop' into remove-party-status	2017-02-02 15:42:04 +05:30
Rushabh Mehta	87037bdd56	[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568	2017-01-30 13:22:51 +05:30
Rohit Waghchaure	92c9ad8c72	Merge branch 'master' into develop	2017-01-28 14:14:33 +05:30
Kanchan Chauhan	b77eaf7053	[URGENT][FIX]Stock Controller fix	2017-01-28 13:26:46 +05:30
Rushabh Mehta	710dc5392f	[merge]	2017-01-27 15:48:31 +05:30
Nabin Hait	cb19f52985	Update stock_controller.py	2017-01-25 19:20:35 +05:30
Rohit Waghchaure	3899d74f15	[Fix] Get valuation rate from item master and update stock value difference	2017-01-25 18:47:53 +05:30
robert schouten	67eff49516	[fix] compact print format not longer ignores format builder	2017-01-25 08:20:43 +08:00
Nabin Hait	349d520ae2	Fixed merge conflict	2017-01-20 15:44:35 +05:30
Nabin Hait	4c952f48f8	Some minor fixes	2017-01-20 15:15:31 +05:30
Nabin Hait	a0b967f2cd	Get valuation rate from Item while not found based on SLE	2017-01-20 12:50:40 +05:30
Rohit Waghchaure	56cc542eb7	[Fix] sales return discount issue	2017-01-18 14:50:24 +05:30
Nabin Hait	dd839055e3	Fixed merge conflict	2017-01-17 15:52:56 +05:30
Rohit Waghchaure	f58cad6b13	[Fix] Calculate paid amount when is pos is enabled	2017-01-17 12:11:57 +05:30
Rushabh Mehta	ffd80a6061	[fix] warehouse test cases	2017-01-16 17:23:20 +05:30
Rushabh Mehta	6695830f3f	[fix] warehouse test cases	2017-01-16 16:57:53 +05:30
Rushabh Mehta	b92087cb2d	[cleanup] move contact, address to frappe 💥	2017-01-13 18:54:47 +05:30
Nabin Hait	b251cd4ccb	Fixed merge conflict	2017-01-13 14:34:54 +05:30
Rohit Waghchaure	29458836e4	[Fix] After amend the status become cancelled even if docstatus is zero	2017-01-13 12:51:19 +05:30
Nabin Hait	007c87ea63	Merge pull request #7440 from nabinhait/gle_repost_optimization Optimization to reduce GLE reposting time for future stock transactions	2017-01-13 11:33:42 +05:30
Nabin Hait	9784d27317	Optimization to reduce GLE reposting time for future stock transactions	2016-12-30 16:21:35 +05:30
Nabin Hait	58291c77e9	Fixed version conflict	2016-12-23 17:43:42 +05:30
Rushabh Mehta	0632ee3da9	Merge branch 'v7.2.0-beta' into develop	2016-12-21 17:31:09 +05:30
Rushabh Mehta	c6bd7ade2f	[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253	2016-12-21 17:30:29 +05:30
Nabin Hait	f573d43b90	fixed version conflict	2016-12-20 11:40:15 +05:30
Nabin Hait	3fe99559ef	Fixed negative stock validation message for translation and fixed test cases	2016-12-16 15:30:43 +05:30
Rohit Waghchaure	6500ef404d	[Fix] Timeout error in item attribute validation	2016-12-16 13:35:50 +05:30
Nabin Hait	8c61f343b3	Validate negative stock on delivery while missing valuation rate for booking expenses	2016-12-15 13:46:03 +05:30
Nabin Hait	f49bbe1142	Cleanup of lead and opportunity status updating logic	2016-12-15 11:51:54 +05:30
Nabin Hait	ad4f1c7fd1	date is optional in get_exchange_rate	2016-12-09 12:14:47 +05:30
Nabin Hait	3113f00c46	Replaced spaces with tabs	2016-12-08 15:42:44 +05:30
Nabin Hait	288a18e0cc	Fixes and patch for Currency Exchange based on date	2016-12-08 15:36:23 +05:30
Nabin Hait	1cc55fbbcb	Fixed merge conflict	2016-12-08 14:09:23 +05:30
Nabin Hait	a8333be6ad	Merge pull request #7023 from frappe/revert-7012-remove-count-star Revert "[optimize] remove count(*) from queries"	2016-11-24 13:26:38 +05:30
Nabin Hait	f89f17cdde	Merge branch 'master' into develop	2016-11-23 16:00:22 +05:30
Nabin Hait	297d74a997	Unlink payment entries on cancellation of invoice	2016-11-23 15:59:00 +05:30
Rushabh Mehta	9872d8cdb5	Revert "[optimize] remove count(*) from queries"	2016-11-21 21:04:47 +05:30
Nabin Hait	d50d6a559c	Merge pull request #7012 from rmehta/remove-count-star [optimize] remove count(*) from queries	2016-11-21 15:28:01 +05:30
Rushabh Mehta	5a258cbc2d	[optimize] remove count(*) from queries	2016-11-21 14:57:36 +05:30
Nabin Hait	c2f8dd71d7	Merge pull request #6965 from manassolanki/qa_redesign [Fix] [Enhancement] Quality Inspection	2016-11-21 14:49:18 +05:30
Manas Solanki	60db98aaff	[Minor] Variable assignment before reference Variable = 'inspection_required_fieldname'	2016-11-18 14:52:13 +05:30
KanchanChauhan	49a50fef63	Group same item in SO print (#6959 )	2016-11-18 13:57:53 +05:30
Nabin Hait	c9b6a07732	[fix] Remove recurring id on amendment only if it is same as amended_from	2016-11-16 18:43:44 +05:30
Nabin Hait	7f6b99aca4	Merge pull request #6962 from KanchanChauhan/payroll-fixes [Fix] Filters to get employee in Payroll	2016-11-16 17:34:00 +05:30
Nabin Hait	8af429da1f	Cleanup and fixes in quality inspection feature	2016-11-16 17:22:38 +05:30
Manas Solanki	cc90241fa5	Quality Inspection Issue 1. validate_inspection() function defination in stock_controller.py 2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py 3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no	2016-11-16 17:22:38 +05:30
mbauskar	e9747a8a6e	[minor] fixes in validate selling price	2016-11-16 17:19:47 +05:30
Kanchan Chauhan	7652b857c8	[Fix] Filters to get employee in Payroll	2016-11-16 15:29:01 +05:30
rohitwaghchaure	7be942db54	[Fix] Status updater for sales order in purchase order (#6944 )	2016-11-16 11:14:32 +05:30
rohitwaghchaure	b3ba7f01ef	[Fix] PO status not changed as material return created against them (#6869 )	2016-11-16 11:10:10 +05:30
Rohit Waghchaure	2285f90b64	added debit and credit note status	2016-11-09 14:47:24 +05:30
Rohit Waghchaure	2f1db57fe1	Added status field in sales invoice and purchase invoice	2016-11-08 18:49:58 +05:30
Nabin Hait	d662502f3c	[fix] Validate if warehouse is not linked to any account	2016-10-24 18:17:57 +05:30
Nabin Hait	9f26bc16b7	Update selling_controller.py	2016-10-20 16:45:53 +05:30
shreyas	e8aaa92816	[Minor] Some more fixes to the code	2016-10-20 15:57:45 +05:30
shreyas	edcba51c8b	[Fix] Added check to validate selling price against valuation rate	2016-10-20 15:57:45 +05:30
shreyas	1cfe2d7b45	[Minor] Validate purchase price against selling price	2016-10-20 15:57:45 +05:30
Nabin Hait	fa1cdd5bf0	Fixed merge conflict	2016-10-18 15:37:33 +05:30
Nabin Hait	fcd10f2e08	Merge pull request #6335 from RobertSchouten/stock_entry [fix] warning for creating stock entry after sales invoice (causing missing gl entries)	2016-10-17 17:39:57 +05:30
Nabin Hait	e040510545	Always calculate additional discount amount if percentage is mentioned	2016-10-13 12:14:47 +05:30
Nabin Hait	cd9c45f816	Fixed merge conflict	2016-10-07 16:53:07 +05:30
Nabin Hait	2f75b7b42e	Fixed merge conflict	2016-10-07 14:16:17 +05:30
Rohit Waghchaure	770d04e633	[Fix] sales order status showing completed, while it's status was to bill	2016-10-07 13:55:48 +05:30
Rohit Waghchaure	7d5298997b	Documentation for payments	2016-10-06 16:49:39 +05:30
Nabin Hait	558f526a68	Fixed version conflict	2016-10-05 17:18:36 +05:30
Nabin Hait	cccc45edc5	Don't throw expense account validation on fetching item details	2016-10-05 17:15:53 +05:30
Nabin Hait	5fd5a77750	Fixed version conflict	2016-10-03 14:13:50 +05:30
Saurabh	4f62c4cf2d	[minor][fix] for condition maker	2016-10-03 12:48:25 +05:30
Rohit Waghchaure	21499e820d	[Enhancement] Supplier quotation added on supplier portal	2016-09-21 17:07:25 +05:30
Chude Osiegbu	256ec170d0	Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate	2016-09-19 03:53:37 +01:00
Chude Osiegbu	1f64f9897c	Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments.	2016-09-19 01:34:49 +01:00
Chude Osiegbu	7e74fb4357	Modification to set_price_list_currency in accounts_controller.py to allow for specification of date in get_exchange_rate call	2016-09-19 00:59:25 +01:00
RobertSchouten	db33ebb0ff	[fix] status updater percent when qty is minus value	2016-09-12 14:54:46 +08:00
robert schouten	6465711ca6	[fix] missing gl entries warnings	2016-09-12 11:17:14 +08:00
Nabin Hait	b8b228ed14	Fixed version conflict	2016-09-06 17:56:32 +05:30
Nabin Hait	ca627fb806	[fix] Fetch advance journal entry in invoice if it is tagged against linked order	2016-09-05 16:17:08 +05:30
Nabin Hait	406f0a38de	Fixed merge conflicts	2016-09-05 15:44:18 +05:30
Nabin Hait	8693b5c93a	Minor fixes	2016-09-05 11:51:45 +05:30
Rohit Waghchaure	560ba391f9	[Enhancement] Purchase return for rejected qty	2016-09-05 00:43:17 +05:30
Nabin Hait	5c69fed218	Ignore closed sales/purchase order in trends report	2016-09-02 12:53:18 +05:30
Rohit Waghchaure	609e2b4ca3	[POS] Currency format issue	2016-08-31 02:04:53 +05:30
Nabin Hait	a26bb96d2d	Merge pull request #6178 from nabinhait/status_updater_fix Ignore validating billed amount against order if order item amount is zero	2016-08-26 12:09:39 +05:30
Nabin Hait	47a3f639ed	Ignore validating billed amount against order if order item amount is zero	2016-08-26 11:39:39 +05:30
Rohit Waghchaure	efb5bf2cfc	[POS] Fixed payment gl entry for sales return	2016-08-25 16:23:47 +05:30
Rohit Waghchaure	ea6d7e9b09	[Fix] decimal button not working	2016-08-23 11:39:44 +05:30
Nabin Hait	3b6dc141c6	[fix] Repost only distinct purchase receipts and invoices	2016-08-19 16:39:50 +05:30
Rohit Waghchaure	baef2624a2	Given provision to enter write off and change amount on POS	2016-08-10 00:50:53 +05:30
Rohit Waghchaure	7127a8f522	Allow user to edit change amount from sales invoice form for is pos	2016-08-08 23:19:18 +05:30
Nabin Hait	99d4ff4a29	Repost gle for future transactions if update stock checked in back dated purchase invoice	2016-08-08 14:12:58 +05:30
Nabin Hait	3bb1a421f0	Change amount calcualtion in POS if there is write off amount and gl entries in this scenario	2016-08-02 16:41:15 +05:30
Rohit Waghchaure	26cf01aaba	[mionr] fixes and cleanups	2016-07-26 00:30:25 +05:30
Maxwell Morais	3557261313	Extend search_fields for customer querie This PR is intended to extend the customer querie adding the meta-info from the doctype using the search fields to extend the customer querie	2016-07-21 23:42:59 -03:00
Rushabh Mehta	fc8e589295	[fix] party status updating bug, fixes #5794 , #5796	2016-07-20 12:09:27 +05:30
Rushabh Mehta	5c52fa9785	[fix] variant error message	2016-07-18 14:40:14 +05:30
Rushabh Mehta	95383bb281	[fix] item attribute validation and tests	2016-07-15 15:12:06 +05:30
Rushabh Mehta	20122aef79	[minor] optimize item attribute validation for #5756	2016-07-15 12:42:41 +05:30
Rushabh Mehta	b8bdfbcead	[minor] optimize item attribute validation for #5756	2016-07-15 12:41:08 +05:30
Rushabh Mehta	ea0ff23891	[cleanup] form dashboards	2016-07-07 14:28:05 +05:30
Rohit Waghchaure	a71d9d33af	Rename prevdoc field in purchase order and purchase receipt doctype	2016-07-06 12:13:29 +05:30
Nabin Hait	ff2f3ef1b1	Test Case Fixes	2016-07-04 11:42:25 +05:30
Nabin Hait	9db1b223da	Payment Entry: Test cases and default remarks	2016-07-04 11:42:24 +05:30
Nabin Hait	13093b4b68	Make payment entry aginst order, payment request and patch to rename advance table fields	2016-07-04 11:42:24 +05:30
Nabin Hait	05aefbbf5d	Payment Entry from invoice	2016-07-04 11:42:24 +05:30
Nabin Hait	1991c7b17d	Payment Reconciliation changes for Payment Entry	2016-07-04 11:42:24 +05:30
Nabin Hait	28a0528ae4	Advance Payment Entry adjustment against Invoice	2016-07-04 11:42:04 +05:30
Nabin Hait	e3a10170f7	Payment Entry submission and more	2016-07-04 11:41:24 +05:30
Nabin Hait	12e2a51519	[new][feature] Payment Entry	2016-07-04 11:41:24 +05:30
Rushabh Mehta	b33df4afe8	[cleanup] link methods made common	2016-07-04 11:39:25 +05:30
Rushabh Mehta	878dfec46a	[minor]	2016-07-04 11:39:25 +05:30
Saurabh	78333c7e07	[fixes] check group condition	2016-06-26 14:27:46 +05:30
Saurabh	7fecb50360	[enhance] rename warehouse account type to stock	2016-06-26 14:27:46 +05:30
Saurabh	4d02949814	[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account	2016-06-25 11:06:14 +05:30
Saurabh	ec8babe7ac	[minor][fix]	2016-06-25 11:06:14 +05:30
Rushabh Mehta	a334062b03	[redesign] website routing system	2016-06-24 16:18:07 +05:30
Rushabh Mehta	2cb7a9f235	[ux] taxes table editable	2016-06-15 16:45:03 +05:30
Alec Ruiz-Ramon	fcaaa29a58	Status updater for quotation/lost to lead, quotation lost to oppt, and to set conversion as priority in lead cleanup squashed	2016-06-09 21:17:57 -04:00
Anand Doshi	34482788f4	[fix] removed bad import	2016-06-09 16:57:16 +05:30
Rushabh Mehta	aed79e993f	[fix] item attribute validation, fixes #5308	2016-06-02 17:49:16 +05:30
Nabin Hait	591a5aba56	Added Project in GL Entry and General Ledger report	2016-05-26 17:51:20 +05:30
Rohit Waghchaure	5d97d89a03	[Fix] Sales Invoice shows default date while no default mentioned	2016-05-17 15:13:17 +05:30
Rushabh Mehta	d42167e0e5	[cleanup] remove Features Setup	2016-05-11 16:47:14 +05:30
Nabin Hait	b81ed45b2b	fixed conflict	2016-05-11 12:52:31 +05:30
Rohit Waghchaure	6087fe178e	[Enhancement] POS	2016-05-09 23:36:15 +05:30
Nabin Hait	a9c4c8fc31	In Purchase Return entry, make sle and gle as per actual inward entry's valuation rate	2016-05-09 17:34:47 +05:30
Nabin Hait	332d29f166	Merge branch 'master' into develop	2016-05-06 16:13:35 +05:30
Nabin Hait	8704bead49	[fix] Validate returned serial nos and batch nos with original document	2016-05-06 15:30:10 +05:30
Nabin Hait	cd0e8ce8ad	Fixes and modification in fixed asset	2016-04-20 17:57:12 +05:30
Nabin Hait	3d9c5c0c20	Fixed Asset module cleanup and fixes	2016-04-20 17:57:11 +05:30
Nabin Hait	14aa9c5320	[fix] Cleanup and fixes in update stock feature in Purchase Invoice	2016-04-18 16:59:47 +05:30
Nabin Hait	ffd1e4efe6	Removed db_set from inside validate	2016-04-18 15:58:44 +05:30
Saurabh	fbb342c1ac	[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI	2016-04-18 15:58:43 +05:30
Saurabh	130c57b201	[fixes] code clean-up	2016-04-18 15:58:43 +05:30
Saurabh	e29248bcb3	[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning	2016-04-18 15:58:43 +05:30
Saurabh	43520f93a1	[fixes] test cases, code cleanup.	2016-04-18 15:58:42 +05:30
jof2jc	524ebbcbb9	Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice	2016-04-18 15:57:55 +05:30
Umair Sayyed	72534deea2	removed Is Sales Item and Is Purchase Item	2016-04-15 12:57:00 +05:30
Nabin Hait	972c25f78d	Fixed conflict	2016-04-14 18:25:53 +05:30
Rohit Waghchaure	ae270d6648	[Fixes] Supplier can view their addresses, default buying price list issue	2016-04-11 13:58:33 +05:30
Anand Doshi	2f957f27b0	[fix] apply Tax Rule for lead	2016-04-08 17:43:08 +05:30
Rushabh Mehta	203cc962f5	[enhancement] Item Selector	2016-04-08 17:21:00 +05:30
Anand Doshi	15f7b1ee1a	[fix] POS paid amount validation using grand total	2016-04-04 15:03:28 +05:30
Rushabh Mehta	948ebfef16	Merge pull request #5108 from neilLasrado/expense-querry Fixed bug in get expense query	2016-04-01 11:44:11 +05:30
Rushabh Mehta	8ca426d94a	Merge pull request #5095 from rohitwaghchaure/new_rfq [Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party	2016-04-01 11:41:15 +05:30
Rushabh Mehta	fff8e6c733	Merge pull request #5080 from nabinhait/fy_overlap [fix] Added overlap validation in fiscal year	2016-04-01 11:37:03 +05:30
Neil Trini Lasrado	30b97b0b45	Fixed bug in get expense query	2016-03-31 23:10:13 +05:30
rohitwaghchaure	62fea0374b	[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party	2016-03-31 21:49:07 +05:30
Rushabh Mehta	acf28af19c	[fix] set default depreciation accounts and test fix	2016-03-31 15:04:06 +05:30
Nabin Hait	2ed0b59747	[fix] Added overlap validation in fiscal year	2016-03-31 12:40:37 +05:30
Nabin Hait	6123560f51	Merge pull request #5076 from vjFaLk/develop Fix for Opportunity	2016-03-31 11:55:07 +05:30
Nabin Hait	c6285069dc	[fix] Item query in bom	2016-03-30 13:10:25 +05:30
Rushabh Mehta	c78b3110b5	[enhancement] configurable portal menu;	2016-03-30 12:29:48 +05:30
Nabin Hait	e8e2d406b5	minor fix	2016-03-29 18:17:03 +05:30
Rushabh Mehta	1d05ada5e9	Merge pull request #4950 from nabinhait/fixed_asset_depreciation Fixed asset depreciation	2016-03-29 16:39:31 +05:30
Rushabh Mehta	7a1b5da830	[cleanup] request for quotation cleanup	2016-03-29 16:04:43 +05:30
Nabin Hait	4fdb05228d	fixed asset depreciation	2016-03-29 11:54:37 +05:30
Nabin Hait	3a15c92c5e	Fixed Asset Depreciation first commit	2016-03-29 11:54:37 +05:30
Valmik Jangla	29563275f5	Fix for Opportunity	2016-03-29 11:18:36 +05:30
Rushabh Mehta	d3fdbaa261	Merge pull request #5041 from nabinhait/recurring_doc_amend [fix] Reset recurring id on amendment	2016-03-28 18:29:44 +05:30
Rushabh Mehta	e1b20a0b29	Merge pull request #5044 from rohitwaghchaure/add_margin_feature [Enhancement] Add margin in sales flow.	2016-03-28 18:27:05 +05:30
rohitwaghchaure	a1064a6149	[enhancement] request for quotation	2016-03-28 17:28:45 +05:30
mbauskar	a52472cf5b	[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py	2016-03-24 14:07:51 +05:30
mbauskar	dcd8b7773d	[fix] calculated rate on py side, added depends on for sales order item	2016-03-24 14:07:50 +05:30
mbauskar	46c97c6e95	[fix] discount percentage fix	2016-03-24 14:07:50 +05:30
mbauskar	36b5189163	calculated the rate and total margin	2016-03-24 14:07:49 +05:30
mbauskar	c97becbd15	added document type in args	2016-03-24 14:07:49 +05:30
Nabin Hait	7504ea7033	[fix] Reset recurring id on amendment	2016-03-23 12:07:34 +05:30
rohitwaghchaure	49ccac5d95	[formatting] Added between in trends.py	2016-03-21 12:31:41 +05:30
Nabin Hait	5996b2f1bb	[fix] recurring document logic	2016-03-18 15:19:54 +05:30
rohitwaghchaure	90ff509f6d	[fix]Earlier recurring billing	2016-03-18 10:44:53 +05:30
rohitwaghchaure	5b9d517d04	[fix]Fiscal year removed from trends report	2016-03-17 22:46:09 +05:30
Nabin Hait	6221117069	[fix] shipping address position in document	2016-03-16 16:23:30 +05:30
Nabin Hait	22d4a7e742	Merge branch 'prod-order' of https://github.com/neilLasrado/erpnext into neilLasrado-prod-order	2016-03-16 12:18:01 +05:30
Nabin Hait	df4deba515	minor fix	2016-03-16 11:16:31 +05:30
Neil Trini Lasrado	6e343e23d9	Renamed project_name to project	2016-03-15 17:50:53 +05:30
Nabin Hait	6c3cc3647b	Merge pull request #4969 from rmehta/link-count [enhancement] sort links on basis of link_count (idx)	2016-03-15 11:40:18 +05:30
Nabin Hait	b1f0a7d52e	Merge pull request #4876 from saurabh6790/valuation_rate_on_so [enhancement] get valuation rate and gross profit on sales order item	2016-03-14 19:18:58 +05:30
Anand Doshi	c75c1d7e3e	[fix] additional fixes after deprecating Fiscal Year	2016-03-11 14:56:19 +05:30
Rushabh Mehta	3574b37ff3	[enhancement] sort links on basis of link_count (idx)	2016-03-11 14:33:04 +05:30
Valmik Jangla	13bb2ba779	Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance	2016-03-11 13:07:49 +05:30
Valmik Jangla	d89dcf60e6	Removed from Delivery Note and Appraisal Added back in Stock Ledger Entry Added validation in GL Entry and SL Entry Stock Controller sets Fiscal Year using Posting Date	2016-03-11 13:07:48 +05:30
Valmik Jangla	c7e774fda9	BudgetError Fix	2016-03-11 13:05:20 +05:30
Valmik Jangla	319bbad4d4	Removed from Stock Entry	2016-03-11 13:05:19 +05:30
Saurabh	d313553ae3	[enhancement] get valuation rate and gross profit on sales order item	2016-03-09 15:42:00 +05:30
shreyas	6f8dfa4c8d	[Minor] Fix print settings for custom print format	2016-03-07 18:22:40 +05:30
Rushabh Mehta	571a9d0f19	[fix] [tests]	2016-03-03 15:03:40 +05:30
Rushabh Mehta	756e518bc1	[fix] recurring	2016-03-03 13:00:30 +05:30
Rushabh Mehta	69cfab8559	[fix] [patch] recurring	2016-03-03 10:37:45 +05:30
Rushabh Mehta	5839a8d7f0	[fixes] usability cleanup of recurring document and added explicit submit_on_creation	2016-03-02 17:51:52 +05:30
ShashaQin	425ab6bb1e	Update queries.py	2016-03-02 13:07:58 +08:00
ShashaQin	8d1dea6aad	Update recurring_document.py	2016-02-27 14:00:58 +08:00
ShashaQin	ed71e6cea6	Update test_recurring_document.py	2016-02-25 15:47:25 +08:00
ShashaQin	5afca21571	Update test_recurring_document.py	2016-02-25 15:21:14 +08:00
ShashaQin	6071ddc3dd	Update recurring_document.py	2016-02-25 11:25:24 +08:00
patilsangram	bf2b511988	[Removed Stop Button from SO and PO]	2016-02-22 16:24:23 +05:30
Nabin Hait	fa413bbab2	Update accounts_controller.py	2016-02-18 18:23:31 +05:30
Nabin Hait	67f40775ff	Update accounts_controller.py	2016-02-18 17:10:42 +05:30
Revant Nandgaonkar	78a62fe123	change args of set_balance_in_account_currency https://github.com/frappe/erpnext/pull/4832	2016-02-18 16:48:35 +05:30
Revant Nandgaonkar	5da941b82c	Need to use set_balance_in_account_currency `b9ad5178e4` needed to make GL Entry	2016-02-18 16:02:05 +05:30
Anand Doshi	ed8d9dadfa	[fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock	2016-02-17 17:14:11 +05:30
Anand Doshi	9a933788be	[cleanup] Compact Item Print	2016-02-16 15:30:17 +05:30
ShashaQin	fd08750e1c	Update print_settings.py	2016-02-16 15:07:09 +05:30
ShashaQin	429ab205d4	Update print_settings.py	2016-02-16 15:07:09 +05:30
Nabin Hait	adc0923c7e	[fix] validate advance only if invoice total is positive	2016-02-09 10:32:41 +05:30
Nabin Hait	289ffb788c	[fix] Advance adjustment in invoice cannot be greater than grand total	2016-02-08 11:07:00 +05:30
Nabin Hait	82cef59fb3	[fix] Purchase Return warehouse validation	2016-02-02 19:05:43 +05:30
shreyas	e970ddcee9	[Fix] 1. Sales Person wise transaction report 2. Sales Person wise target variance report 3. Sales order trend report generation for selection in group by feild	2016-01-29 15:41:44 +05:30
Anand Doshi	9c24bec654	Merge branch 'nabinhait-mc_fix_5' into develop	2016-01-29 12:16:35 +05:30
Anand Doshi	7c0a58ac3f	[fix] show formatted currency value in advance paid validation	2016-01-29 12:16:24 +05:30
Nabin Hait	5bedd649df	Merge pull request #4691 from anandpdoshi/cleanup/remove-is-service-item [cleanup] Removed 'Is Service Item' checkbox and filters	2016-01-29 11:10:54 +05:30
Nabin Hait	b2206d1155	[fix] Multi currency advance payment against Order	2016-01-27 15:43:24 +05:30
shreyas	eba9ca4d66	[Minor]Change to maintain args ordering convention	2016-01-26 16:29:26 +05:30
Anand Doshi	01de945388	[cleanup] Removed 'Is Service Item' checkbox and filters 'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.	2016-01-26 16:22:51 +05:30
shreyas	f76853a8d9	[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen	2016-01-25 21:25:11 +05:30
shreyas	2563f404d2	[Minor Change] Updated queries.py	2016-01-25 18:19:14 +05:30
shreyas	29b565fdf5	Added Disabled field to Supplier and Customer doctype Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO	2016-01-25 18:19:13 +05:30
Anand Doshi	39e2c2bb09	[fix] obey no_copy while creating recurring documents	2016-01-25 17:03:50 +05:30
Saurabh	47fd5e0ff0	[fixes] compare variants in lower case	2016-01-21 15:46:55 +05:30
Nabin Hait	fb0b24af78	Rounding based on smallest circulating currency fraction value	2016-01-20 17:07:35 +05:30
Nabin Hait	dbbc3eb8a6	Merge pull request #4656 from nabinhait/gle_rounding [fix] Round off gle due to currency conversion	2016-01-20 16:48:42 +05:30
Nabin Hait	5b19aeecb4	Merge pull request #4642 from nabinhait/return_fix1 [fix] Accept return items in any warehouse	2016-01-20 16:46:33 +05:30
Nabin Hait	61673aafd4	Merge pull request #4640 from nabinhait/fix50 Fixes	2016-01-20 16:35:46 +05:30
Nabin Hait	d4507ac6a0	[fix] Round off gle due to currency conversion	2016-01-20 16:14:27 +05:30
RicardoJohann	3fb5340188	Update queries.py	2016-01-20 14:32:59 +08:00
Nabin Hait	20105d8a0d	[fix] Accept return items in any warehouse	2016-01-19 18:05:28 +05:30
Nabin Hait	34d2822483	Fixes in get_item_details and test cases	2016-01-19 16:48:32 +05:30
Rushabh Mehta	b46069d44b	[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order	2016-01-15 16:59:26 +05:30
Rushabh Mehta	10d634b016	[fix] set sales partner from previous document, fixes #4611	2016-01-14 10:34:18 +05:30
Anand Doshi	6b71ef5843	[refactor] changed set_modified, change_modified to update_modified like in the framework	2016-01-06 16:32:06 +05:30
Nabin Hait	c040075bd4	[patch] Update billing status in Delivery Note and Purchase Receipt	2016-01-06 15:42:44 +05:30
Nabin Hait	bdab0eea0f	Billing status in Purchase Receipt	2016-01-06 15:42:43 +05:30
Nabin Hait	5b13b99441	Update billing status in Delivery Note if directly invoiced against SO	2016-01-06 15:42:27 +05:30
Nabin Hait	6b068e1367	[fix] Disable atrribute table in variant item record	2015-12-31 15:44:12 +05:30
Nabin Hait	6626e32719	[fix] Disable atrribute table in variant item record	2015-12-31 14:54:57 +05:30
Nabin Hait	3769d87240	Additional Discount amount based on percentage	2015-12-18 13:12:08 +05:30
Saurabh	70ed6ede5c	[fixes] patch to update delivery status for drop ship item	2015-12-08 14:48:19 +05:30
Nabin Hait	c4edcf1532	[fix] Recurring test case fixed for the 1st day of the month	2015-12-01 16:28:35 +05:30
Nabin Hait	ddc295b4b3	[minor] Set expense account as Stock RBNB for perpetual inventory after mapping	2015-11-30 18:40:28 +05:30
Anand Doshi	ebae726237	[fix] status update - update qty after int float not null change	2015-11-25 17:55:47 +05:30
Anand Doshi	602e8253be	[enhancement] Int, Currency, Float, Percent as not null and default to 0	2015-11-19 13:23:36 +05:30
Saurabh	2e292060c5	[fix] Reserved and ordered qty fix for drop ship orders	2015-11-18 17:39:26 +05:30
Nabin Hait	90c6d7bb47	[fix] Invoice Outstanding calculation related to advance	2015-11-13 14:04:03 +05:30
Rushabh Mehta	d48c2394e8	[cleanup] drop ship testing & cleanup	2015-11-04 15:24:04 +05:30
Rushabh Mehta	b1d8979a59	Merge pull request #4179 from saurabh6790/drop-shipping Drop shipping	2015-11-02 15:43:48 +05:30
Rushabh Mehta	00b4663e12	Merge pull request #4262 from saurabh6790/close_pr_dn [feature] Close feature for Purchase Receipt and Delivery Note	2015-11-02 15:21:19 +05:30
Saurabh	a8a91cca16	[feature] Close feature for Purchase Receipt and Delivery Note	2015-11-02 12:57:08 +05:30
Anand Doshi	aba8fdd18d	[fix] issues encountered migrating from v3/4 to 6	2015-10-31 22:49:42 +05:30
Saurabh	6956eee790	[fixes] test case and code rewrite	2015-10-29 19:43:35 +05:30
Saurabh	6d64fe378d	[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1	2015-10-29 19:43:34 +05:30
Saurabh	8a8ef85174	[fixes] reviwe fixes	2015-10-29 19:43:33 +05:30
Saurabh	5e0b0b4b97	[enhance] make PO from SO if supplier is specified	2015-10-29 19:43:33 +05:30
Saurabh	e930f0f74e	[fixes] filter on supplier list for DropShip, checking closed status	2015-10-29 19:43:33 +05:30
Saurabh	1a9646739a	[fixes][rename-field-name] drop_ship to is_drop_ship	2015-10-29 19:43:32 +05:30
Saurabh	98b287565a	[enhance] close purchase order	2015-10-29 19:43:32 +05:30
Saurabh	c6dbe70256	[Fixes] Drop Shipping	2015-10-29 19:43:32 +05:30
Saurabh	5b7e9a1c94	[minor fixes]	2015-10-29 19:43:31 +05:30
Saurabh	c306b21415	[merge fixes]	2015-10-29 19:43:31 +05:30
Anand Doshi	21e09a2bd8	[enhancement] Ability to disable an Item	2015-10-29 12:39:47 +05:30
Anand Doshi	d8bc40d7f0	[fix] party gle currency validation	2015-10-22 17:55:22 +05:30
Nabin Hait	0045c305ac	Period Closing Voucher as per multi currency	2015-10-22 16:21:37 +05:30
Anand Doshi	7c0eadb451	[fix] Patch template item to be shown in website, show variant's description and price on change of attribute	2015-10-20 17:30:02 +05:30
Neil Trini Lasrado	a4fad72a65	Considered greater precision of value and increment (better code)	2015-10-20 12:20:49 +05:30
Neil Trini Lasrado	e65ac00f36	Considered greater precision of value and increment	2015-10-20 12:20:49 +05:30
Neil Trini Lasrado	75bd0f7cfe	Fixed issue in Item Variant for Numeric Attributes	2015-10-20 12:20:49 +05:30
Nabin Hait	afd14f6f0e	[fix] Allowed accounts with account type='Income Account' for default income account in item	2015-10-19 15:27:58 +05:30
Rushabh Mehta	14a908bdec	[test] [fix] abs(valuation_rate) for moving average	2015-10-15 12:28:20 +05:30
Nabin Hait	b445be3552	Test case for delivery to target warehouse	2015-10-13 15:46:42 +05:30
Nabin Hait	c865f229fb	Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status	2015-10-13 15:46:42 +05:30
Rushabh Mehta	86125b2b9f	[fix] sales order status for maintenance	2015-10-13 12:31:05 +05:30
Nabin Hait	51e980dd2c	[fix] Multiple minor fixes	2015-10-10 18:10:05 +05:30
Nabin Hait	bcd655a985	Merge pull request #4109 from rmehta/fix-sales-purchase-order-status [fix] sales & purchase order status	2015-10-07 11:34:30 +05:30
Rushabh Mehta	0bc3ca02f3	[fix] default contact for website	2015-10-03 12:08:43 +05:30
Rushabh Mehta	d10ba853e6	[fix] sales & purchase order status	2015-10-02 17:16:51 +05:30
Anand Doshi	7afaeb0820	[fix] the case when party account currency is missing	2015-10-01 18:55:43 +05:30
Anand Doshi	4945b94950	[fix] added validation to match account currency with existing gle and test case	2015-09-30 16:41:15 +05:30
Anand Doshi	cd0989e051	Added method get_account_currency	2015-09-30 15:11:12 +05:30
Anand Doshi	b20baf894f	[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account	2015-09-30 15:11:12 +05:30
Anand Doshi	6534ad082d	Merge pull request #4069 from anandpdoshi/round-status-updater-percentages Round status update percentages to 2 decimals	2015-09-28 19:40:01 +05:30
Rushabh Mehta	72b1128467	[fixes] accounts controller add flt	2015-09-28 17:29:46 +05:30
Anand Doshi	d970b001a4	[fix] Round status update percentages to 2 decimals	2015-09-28 16:52:22 +05:30
Rushabh Mehta	3d76686b82	[shopping-cart] cart via Jinja WIP	2015-09-23 12:49:16 +05:30
Rushabh Mehta	156ce607e2	[cleanup] [wip] portal, shopping cart cleanup	2015-09-23 12:49:16 +05:30
Anand Doshi	53a0de7607	[fix] Recalculate rate after applying Pricing Rule	2015-09-22 15:26:53 +05:30
Anand Doshi	be6cfddc4d	[hotfix] multicurrency gl entry	2015-09-17 21:07:04 +05:30
Anand Doshi	bf8c8df9ce	Revert "[hotfix] set_balance_in_account_currency" This reverts commit `9acd6a2629`.	2015-09-17 20:55:50 +05:30
Anand Doshi	9acd6a2629	[hotfix] set_balance_in_account_currency	2015-09-17 20:29:31 +05:30
Anand Doshi	d4aa27cbb8	Merge pull request #4025 from anandpdoshi/split-emails use the new split_emails method to split emails by comma. Merge this after Communication CC is merged.	2015-09-17 14:00:03 +05:30
Anand Doshi	c5f919eb68	[fix] use the new split_emails method to split emails by comma	2015-09-16 19:20:55 +05:30
Saurabh	5fe0086d9a	[Fixes] Warehouse check while company delete & Variant Attribute value check	2015-09-16 16:59:24 +05:30
Anand Doshi	1fef2fad2d	[minor] fixes in queries and payment tool	2015-09-14 18:27:21 +05:30
Anand Doshi	979326b0b1	minor fixes in multi-currency	2015-09-11 16:33:45 +05:30
Rushabh Mehta	d461d462aa	[minor] rename notified_modifed > notified_update. Merge with #1296	2015-09-11 15:34:41 +05:30
Nabin Hait	2377cdfa4e	Fixed conflict	2015-09-09 18:45:41 +05:30
Nabin Hait	e3ae05aabd	Multi-currency: Exchange Rate in Journal Entry	2015-09-09 18:43:12 +05:30
Nabin Hait	cd103c05d6	Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order	2015-09-08 19:24:35 +05:30
Nabin Hait	11a746d363	Fixed conflict	2015-09-03 16:04:11 +05:30
Nabin Hait	98096771c2	[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that	2015-09-03 10:28:08 +05:30
Anand Doshi	283850ce47	Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes Attributes in the variant should be in the same order as in the Template	2015-09-02 16:09:09 +05:30
Anand Doshi	099bbbded0	Attributes in the variant should be in the same order as in the Template - Moved Item Variant code from item.py to controllers/item_variant.py - Use Template Item's order of Attribute for Variant Item	2015-09-02 15:56:55 +05:30
Nabin Hait	e52ee553c0	Removed debug flag	2015-09-02 11:32:14 +05:30
Nabin Hait	6e439a5e53	Multi currency: test case and fixes	2015-08-28 19:24:22 +05:30
Nabin Hait	13d8835b75	Fixed merge conflict	2015-08-27 14:55:34 +05:30
Nabin Hait	4ffd7f3d05	Outstanding, paid and write-off amount in Invoice	2015-08-27 12:28:36 +05:30
Anand Doshi	fa65c7bf29	[minor] stopped or cancelled message	2015-08-26 19:15:24 +05:30
Rushabh Mehta	b6398be232	[minor] [fix] project query	2015-08-26 10:51:04 +05:30
Anand Doshi	fe13bfed44	Fixes to Return Improvements pull request - Added "Returned Qty" in Sales and Purchase Order - Map Expense Account in Return Delivery Note - Defined some No Copy fields - Added "Credit Note" and "Debit Note" Print Headings - Fixed patch	2015-08-25 19:07:04 +05:30
Nabin Hait	b719c469c8	Allow different rate in Return Entry	2015-08-25 14:11:13 +05:30
Nabin Hait	1f94fa25a8	Update delivered / ordered qty in sales/purchase order from return entry Reserved Qty logic cleaned up	2015-08-25 14:11:12 +05:30
Nabin Hait	895029dc15	Validate currency in transactions	2015-08-21 14:31:47 +05:30
Nabin Hait	c561a499d7	Multi currency GL entry fixes	2015-08-21 14:31:47 +05:30
Nabin Hait	46bcbaf97b	GL Entry in account currency	2015-08-21 14:31:47 +05:30
Nabin Hait	046db626a2	[fix] Fetch advances in Sales/Purchase Invoice	2015-08-21 12:34:41 +05:30
Nabin Hait	1826791891	[fix][patch] Reserved Qty logic fixed and reposted for existing items	2015-08-19 11:00:00 +05:30
Nabin Hait	0da11f1b10	[fix] Reset price list rate based on Pricing Rule type	2015-08-13 14:58:19 +05:30
Rushabh Mehta	1828c12481	[refactor] added dynamic link in journal entry, #3847	2015-08-12 12:28:33 +05:30
Nabin Hait	6dc40e9baf	Update accounts_controller.py	2015-08-10 19:18:39 +05:30
bobzz-zone	b4c7bad33d	Update buying_controller.py dont force change conversion factor	2015-08-05 11:30:12 +07:00
Nabin Hait	0e1314c5b5	[fix] serial no validation in return entry	2015-08-04 15:22:48 +05:30
Nabin Hait	b7c0c55d61	Validate serial no in return entry with against document	2015-08-04 12:18:12 +05:30
Nabin Hait	5bbe823106	[patch] Fix outstanding amount for original invoice for return entry	2015-08-03 19:19:11 +05:30
Anand Doshi	da77abc25b	Merge pull request #3767 from nabinhait/tax_calc [fix] Tax calculation while discount applied on net total	2015-08-03 19:17:04 +05:30
Nabin Hait	db53a789be	[fix] Tax calculation while discount applied on net total	2015-08-03 19:10:59 +05:30
Rushabh Mehta	b16b9cd7a0	[fix] force stock_uom in item and stock ledger entry	2015-08-03 16:13:33 +05:30
Nabin Hait	9e26bcfeeb	[fix] Actual tax amount should be negative while creating return entry	2015-07-30 11:48:18 +05:30
Nabin Hait	453cc374d4	- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice - Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered - Make packing list on validate	2015-07-29 15:59:57 +05:30
Nabin Hait	e95c18a42d	Merge pull request #3744 from nabinhait/return Sales / Purchase Return Improvements	2015-07-29 15:51:34 +05:30
Nabin Hait	9117af3077	[fix] Uncheck Is POS option while creating return entry against POS Invoice	2015-07-29 15:40:59 +05:30
Rushabh Mehta	1e8025b327	[cleanup] yes/no selects changed to checks in Item	2015-07-29 11:38:33 +05:30
Neil Trini Lasrado	cc7cb2a70a	Allowed frozen_accounts_modifier to create records against frozen customer/supplier	2015-07-28 12:17:03 +05:30
Neil Trini Lasrado	79bf233734	Test Cases added to check if customer is frozen	2015-07-28 12:17:03 +05:30
Neil Trini Lasrado	3fbbb71afc	Added ability to freeze Customer/Supplier	2015-07-28 12:17:02 +05:30
Nabin Hait	3cf67a462b	Cleanup and test cases for serialized item	2015-07-24 13:26:54 +05:30
Nabin Hait	04d244a360	Credit Note print format	2015-07-24 13:26:54 +05:30
Nabin Hait	246ed3f122	Test cases for sales return	2015-07-24 13:26:53 +05:30
Nabin Hait	6b25708b7a	Minor fixes	2015-07-24 13:26:53 +05:30
Nabin Hait	1d21842f68	Sales / Purchase Return redesigned via negative DN / SI / PR / PI	2015-07-24 13:26:53 +05:30
Nabin Hait	0847f9a074	Reserved warehouse should not be validated on cancellation of sales order	2015-07-14 18:23:05 +05:30
Neil Trini Lasrado	ed8cecbdd8	Sales BOM renamed to Product Bundle	2015-07-13 12:41:27 +05:30
Nabin Hait	6e38e917eb	Reserved warehouse should not be validated on cancellation of sales order	2015-07-13 11:36:36 +05:30
Neil Trini Lasrado	ebb60f5dbc	Fixed issues in Expired Batches while making Stock Entry	2015-07-08 15:24:02 +05:30
Nabin Hait	7580723ab3	Recurring docs should not consider Stopped documents and should be scheduled for hourly	2015-07-02 14:41:27 +05:30
Neil Trini Lasrado	e2d8dd0663	added recurring print format to sales/purchase invoice and order	2015-06-29 12:50:41 +05:30
Nabin Hait	93cdee4503	[fix] Escape values in queries	2015-06-27 12:51:00 +05:30
Nabin Hait	000835c454	[fix] Fiscal year issue due to missing field in Material Request	2015-06-08 12:10:43 +05:30
Nabin Hait	7cbd916b00	[fix] Fiscal year issue due to missing field in Material Request	2015-06-08 12:06:33 +05:30
Rushabh Mehta	c8b406d050	[fix] duplicate status for Submitted, Cancelled	2015-06-02 12:17:14 +05:30
Rushabh Mehta	a33d468d30	[fixes] portal, issues, addresses etc	2015-06-01 17:15:42 +05:30
Anand Doshi	ff8a854b82	Fixes #3349 . Thanks @abelbm for reporting.	2015-05-26 18:13:28 -04:00
Nabin Hait	fd4bcd855b	test case fixes	2015-05-22 16:55:55 +05:30
Nabin Hait	8252117fe5	set tax amount also in base currency after manipulation	2015-05-19 16:30:17 +05:30
Rushabh Mehta	9dd8aab211	[fix] status updater	2015-05-18 11:19:10 +05:30
Nabin Hait	1fe50120a3	minor fix	2015-05-16 12:14:54 +05:30
Nabin Hait	a6ee8290ce	Inclusive tax for deduction and manipulation of tax amount to fix rounding issue	2015-05-15 12:02:27 +05:30
Nabin Hait	e6e456b373	message fixed	2015-05-13 17:21:44 +05:30
Nabin Hait	ffc7f3fef6	Apply default taxes on loading of document	2015-05-12 15:07:02 +05:30
Nabin Hait	574d5ff535	fetch only stock items as raw materials supplied for subcontracting	2015-05-07 16:29:29 +05:30
Nabin Hait	2b3e065efc	[fix] taxes and charges input value	2015-05-05 16:33:58 +05:30
kressi	d1aa37f521	removed attributes from frappe is_website_user	2015-05-02 10:24:17 +02:00
Nabin Hait	c5b8f7eb46	fix in trends report	2015-04-30 16:13:46 +05:30
Nabin Hait	5616ff417c	Account type Temporary and removed Aging Date field from all documents	2015-04-27 18:08:51 +05:30
Rushabh Mehta	50ce9753e0	[minor] added cache in get_value	2015-04-27 13:13:50 +05:30
Rushabh Mehta	38c6b52770	[rename] group_or_ledger to is_group	2015-04-23 13:14:17 +05:30
Nabin Hait	ddaedefb32	minor fix for fieldname	2015-04-17 15:01:41 +05:30
Rushabh Mehta	9e6812cfab	Merge pull request #3108 from BhupeshGupta/fix_bank_reports Add/Fix Bank Reports Filters	2015-04-17 14:17:22 +05:30
bhupeshg2	e2e973f7be	Add reqd to bank clearance aummary report Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query	2015-04-14 23:09:32 +05:30

... 18 19 20 21 22 ...

2233 Commits