Commit Graph

386 Commits

Author SHA1 Message Date
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop 2018-10-04 11:51:30 +00:00
Rohit Waghchaure
210f4984f7 [Fix] Payment request not working 2018-10-03 15:55:51 +05:30
Faris Ansari
e0a148474d fix: Translation string (#15561) 2018-10-03 10:37:41 +05:30
Zarrar
e83ff38c10 [Enhance] Deferred Expense (#15437)
* added section for deferred expense in item master

* added default expense account field in Company master

* added deferred expense section in purchase invoice item

* validation and getter code added

* scheduler event to book expense every month

* codacy, import fix and other minor fixes

* rectify debit credit logic for expense

* commonify js code for deferred expense and revenue

* remove deferred calculation and validation

* common file to calculate deferred revenue and expense

* codacy fixes

* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
rohitwaghchaure
713cfc786f [enhance] Payment order (#15056) 2018-09-11 17:40:37 +05:30
Sanjay Kumar
1b49f3a4e7 Allow cost center in entry of balance sheet accounts (#14972)
* Allow Cost Center In Entry of Balance Sheet Account

* Add parent cost center in get payment entry

* Add Tests for Allow Cost Center In Entry of Balance Sheet Account

* Add tests for cost center wise account and party balance

* set parent cost center in taxes

* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents

* fix Codacy and Travis issue
2018-09-06 14:39:35 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Shreya Shah
0631aed3d9 Discount amount field in all transactions' child tables (#15124)
* Add discount_amount and base_discount_amount in Sales Invoice Item

* Add patch for existing documents

* Discount amount field in all child tables of Purchase and Selling

* Remove console statements
2018-08-14 10:51:48 +05:30
Saurabh
20fb443f0c [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
rohitwaghchaure
8356d4b892 [Fix] disable_rounded_total not found error (#15113) 2018-08-09 15:51:11 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +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
Nabin Hait
e45ec661ea
Additional fields in Item Price (#14540)
* [IMPROVEMENT] Item Price New Fields and Features

* [IMPROVEMENT] Item Price

 - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
 - Stock Setting to accept Default Price List for Purchase or Sales Item
 - Move Item Section in Item Price

* Fetch default Item Price based on Customer as null

* test fixes

* Code cleanup and fixed the issue of incorrect item price fetched against the customer

* Removed min qty from packing_increment calculation

* Removed auto_update_price_list_rate from the stock settings

* Revert sales_order.json changes

* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings

* Removed unnecessory file

* Fixed item price validation code
2018-08-01 17:44:34 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Shreya Shah
8395a7ad6f Modifications in last purchase rate button (#14948)
* Make last purchase rate button visible until submitted

* Move buttons

- Get last purchase rate and link to material request buttons moved to toolbar under Tools button

* Remove disable fetch last rate functionality

* Make last purchase rate field read_only
2018-07-18 12:27:27 +05:30
Nabin Hait
26786bd35d minor route fix for general ledger 2018-07-17 15:59:15 +05:30
Zarrar
9a3b785a03 [Minor] Employee Separation Fix (#14867)
* delete associated task & project forcefully
in Employee Seapration cancel trigger

* remove leftover print statement

* remove console statements
2018-07-11 14:34:55 +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
Charles-Henri Decultot
8b22310d66 Allow auto repeat update (#14706)
* Allow auto repeat update

* Allow auto-repeat reference update
2018-06-28 14:27:58 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Nabin Hait
875c941f3d fixes in setting itemised tax breakup 2018-06-18 17:41:27 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
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
f270567c45 [Fix] Test cases for asset 2018-06-12 12:20:52 +05:30
Prateeksha Singh
ea7533fa75 [tax-breakup] store itemized tax by item_name when can 2018-06-11 13:31:33 +05:30
Sushant Nadkar
64907e5083 Validate response message for frappe call (#14343) 2018-06-05 10:33:04 +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
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
Shreya
0db85067b2 Add For Buying and For Selling checkboxes in Currency Exchange 2018-05-15 12:48:10 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Faris Ansari
404f39d373 [fix] apply price list
in_apply_price_list flag remains true if server exception occurs
2018-05-14 15:46:45 +05:30
Zlash65
2e0809801d controller and other changes 2018-05-14 11:45:38 +05:30
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings (#13897) 2018-05-03 16:24:52 +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
rohitwaghchaure
0065624fe0 Tax amount showing under wrong tax header in the report (#13843) 2018-05-02 12:20:55 +05:30
Shreya
14bd43d5eb minor changes 2018-04-30 15:30:42 +05:30
Shreya
a20157af17 on item, warehouse and batch triggers, fetch serial nos based on batch 2018-04-26 14:39:21 +05:30
Nabin Hait
2b682c82e8 Fixed merge conflict 2018-04-04 11:40:16 +05:30
Manas Solanki
a7f5589564 fix for the update button in the sales invoice (#13435) 2018-04-02 10:32:00 +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
Jay Parikh
33b2614377 [Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966) 2018-02-16 14:45:40 +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