Rohit Waghchaure
d5e45481cd
fix: code cleanup
2019-03-28 17:09:57 +05:30
rohitwaghchaure
a8c9b81d93
Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups
...
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:52:55 +05:30
Rohit Waghchaure
39a41e7427
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:51:57 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Saurabh
6cc9831ce9
Merge branch 'hotfix'
2019-03-28 13:51:58 +05:30
Saurabh
f2036dd1d1
bumped to version 11.1.17
2019-03-28 14:21:58 +06:00
Saurabh
1271dea39b
Merge pull request #17035 from gaurav-naik/issue-17033
...
fix(regional,italy): autoset tax id, cf from customer before validating
2019-03-28 12:46:24 +05:30
rohitwaghchaure
89a2577ae5
Merge pull request #17032 from surajshetty3416/fix-group-same-items-in-printview
...
fix(print): Fix group same items for print view
2019-03-28 12:42:22 +05:30
Gaurav
bd80fd13cb
fix(regional,italy): autoset company cf, tax_id before validating
2019-03-28 12:18:03 +05:30
Saurabh
ea19250884
Merge pull request #16859 from rohitwaghchaure/added_new_tags_e_invoice_xml
...
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-28 11:19:44 +05:30
Faris Ansari
8fdcda7d6d
Merge pull request #16411 from adityahase/dashboard
...
feat: Accounting Dashboard
2019-03-28 11:16:41 +05:30
Gaurav
010acf75fa
fix(regional,italy): autoset tax id, cf from customer before validating missing values
...
Fixes issue #17033
2019-03-28 10:42:29 +05:30
Himanshu
4d45ca08de
fix(Issue): Time left and display only if Agreement exists ( #17014 )
...
* fix: time left and display only if agreement
* fix: remove div if present
* code refactor
* use frappe.scrub
* code formatting
Co-Authored-By: hrwX <himanshuwarekar@yahoo.com>
* remove unused fields
* remove unsed return value
2019-03-28 07:24:54 +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
1b7059b867
fix: ImponibileImporto calculation
2019-03-27 15:33:47 +05:30
rohitwaghchaure
fa638443bc
Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements
...
feat: stock entry enhancements
2019-03-26 22:50:54 +05:30
rohitwaghchaure
4510e3a836
Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making
...
fix: offline pos, duplicate records creating
2019-03-26 22:49:42 +05:30
Himanshu
e43b6beff0
fix(Leave Balance Report): total allocated leaves not calculated properly ( #16969 )
...
* fix: total alloted leaves not calculated properly
* fix: Possible SQL injection
* typo fix in sql query
* prevent sql injection again ?
* Use ORM for query
2019-03-26 21:42:12 +05:30
Rohit Waghchaure
22ebaf1b11
fix: added tags for discount amount, multiple customer po no, delivery notes
2019-03-26 20:19:46 +05:30
Rohit Waghchaure
1df62097f6
fix: offline pos, duplicate records creating
2019-03-26 19:15:53 +05:30
Prateeksha Singh
6d2bb9126a
Merge pull request #17019 from pratu16x7/hotfix-stock_entry_from_bom
...
fix(uom): Get items as per UOM defined in BOM
2019-03-26 18:00:50 +05:30
Nabin Hait
411f66a177
Merge pull request #17006 from deepeshgarg007/account-fix
...
fix: Ignore root company validation setting in company master
2019-03-26 17:49:21 +05:30
deepeshgarg007
3eeb1cacb0
fix: Change name to Allow Account Creation against Child Company in company master
2019-03-26 17:18:06 +05:30
Prateeksha Singh
a0927c1ba6
fix: correct use of include_item_in_manufacturing
2019-03-26 16:55:13 +05:30
Nabin Hait
8aaee57921
fix(uom): Get items as per UOM defined in BOM, fixes #15081
2019-03-26 16:53:13 +05:30
rohitwaghchaure
e196b3120e
Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise
...
feat: Stock ageing report warehouse wise
2019-03-26 16:21:17 +05:30
deepeshgarg007
c45c2bdabb
fix: Missing semicolon
2019-03-26 15:38:38 +05:30
deepeshgarg007
7aefc15352
fix: Allow to add child account if ignore validation checked
2019-03-26 15:09:29 +05:30
Rohit Waghchaure
5816fc2801
Renamed subcontract to Send to Subcontractor
2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428
renamed purpose in stock entry
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46
fix: test cases
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48
feat: provision to make Maintenance Schedule from sales invoice
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
9faed1b433
feat: added button get items from material request in stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
8ce2d50706
Added test cases
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
186c758087
feat: added good in transit feature in the stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
1f2f9cf360
feat: added stock entry type master to select purpose in the stock entry
2019-03-26 12:52:31 +05:30
Rohit Waghchaure
327c194144
Added hsn code field in the stock entry item table
2019-03-26 12:52:08 +05:30
Raffael Meyer
fdbb516a1b
fix(projects): Auto-set employee and company in Timesheet ( #16743 )
...
* fix(projects): auto-set employee and company
* only set employee and company if document is unsaved
* use frm.set_value()
2019-03-26 12:47:36 +05:30
rohitwaghchaure
392bc54a34
Merge pull request #16977 from rohitwaghchaure/moved_distribution_from_parent_to_child
...
feat: Added item group variance report for sales partner, commonified item group wise target variance report
2019-03-26 12:41:47 +05:30
Rohit Waghchaure
4ae221946b
renamed report
2019-03-26 11:14:06 +05:30
deepeshgarg007
1c785a99b1
fix: Added setting in company to ignore root company validation
2019-03-25 22:32:29 +05:30
Rohit Waghchaure
1c1d0bb1c7
feat: commonified item group wise target variance report
2019-03-25 17:56:43 +05:30
rohitwaghchaure
7779bb3839
Merge pull request #17010 from rohitwaghchaure/rename_pricing_rule_child_doctypes
...
fix: rename pricing rule child doctype names
2019-03-25 17:50:02 +05:30
Faris Ansari
843b7f6dd5
fix: Reorder Currency column to fix print ( #17008 )
...
Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.
2019-03-25 15:50:36 +05:30
rohitwaghchaure
0a03e3d30c
Merge pull request #17011 from rohitwaghchaure/fix_incorrect_paid_amt_in_accounts_receivable_summary_report
...
fix: incorrect paid amount in accounts receivable summary report
2019-03-25 15:41:29 +05:30
Rohit Waghchaure
4ed7d035cb
fix: incorrect paid amount in accounts receivable summary report
2019-03-25 15:37:25 +05:30
Rohit Waghchaure
4792a84b5f
fix: rename pricing rule child doctype names
2019-03-25 14:28:08 +05:30
rohitwaghchaure
794b6b6c0d
Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix
...
fix: Show consolidated amount of payment entries in Bank reconciliation
2019-03-25 14:11:47 +05:30
Rushabh Mehta
5770ad9e8c
Merge pull request #16963 from itusedyetnew/develop
...
Fix:stock_values_on removed append function on string
2019-03-25 12:03:53 +05:30
