Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,012 Commits 3 Branches 0 Tags 1 GiB
165e92ad5b
Commit Graph

17612 Commits

Author SHA1 Message Date
rohitwaghchaure
892f675cf7
Merge pull request #17069 from frappe/revert-16950-fix-issue-credit 
feat: Revert "Fix(Delivery Note): Fix issue credit note"
 2019-03-30 14:25:08 +05:30
rohitwaghchaure
223bd45e06
Merge pull request #17039 from surajshetty3416/fix-bom-item-subquery-issue 
fix: Subquery in get_bom_items method
 2019-03-30 14:23:25 +05:30
rohitwaghchaure
725f37cea5
Revert "fix(Delivery Note): Fix issue credit note" 2019-03-30 13:21:50 +05:30
rohitwaghchaure
f3a1fa0bae
Revert "Fix(Delivery Note): Fix issue credit note" 2019-03-30 12:33:54 +05:30
rohitwaghchaure
b6505bddeb
Merge pull request #17025 from hrwX/fix_issue_credit 
fix(Delivery Note): Fix issue credit note
 2019-03-30 12:31:29 +05:30
rohitwaghchaure
5fdbdd50f9
Merge pull request #16950 from hrwX/fix-issue-credit 
Fix(Delivery Note): Fix issue credit note
 2019-03-30 12:31:18 +05:30
Himanshu
52ae923566 fix(Update GSTIN): remove '.__' from template (#17061) 
'.__'  Avoid Server Side Template Injection
 2019-03-30 12:11:27 +05:30
Himanshu
20c17b8229 fix(Update GSTIN): remove '.__' from template (#17062) 
'.__' Avoid Server Side Template Injection
 2019-03-30 12:11:01 +05:30
rohitwaghchaure
43d79eaa92
Merge pull request #17057 from hrwX/bank_reconciliation_fix 
fix(Bank Reconciliation): get credit and debit as float and not string
 2019-03-30 10:16:12 +05:30
rohitwaghchaure
9d159be826
Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account 
fix: user not able to create chart of account in parent if child has no chart of account
 2019-03-30 10:14:19 +05:30
rohitwaghchaure
689a967443
Merge pull request #17065 from rohitwaghchaure/not_able_to_create_chart_of_account_develop 
fix: user not able to create chart of account in parent if child has no chart of account
 2019-03-30 10:13:55 +05:30
Deepesh Garg
56e23e7d47 feat: GSTR1 json format download (#16887) 
* feat: download gstr-1 b2b in json in its appropriate json format

* fix: download file as raw type

* feat: added logic to convert export gst data to its json

* code commonify and logic for b2cl added

* fix: Codacy and typo fixes

* fix: B2B json creation fixes

* fix: Filter customer by category

* fix: Fetch fp from to date
 2019-03-29 22:22:54 +05:30
scmmishra
6f82f96816 Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix 2019-03-29 20:05:40 +05:30
rohitwaghchaure
8dadd4b0b2
Merge pull request #17059 from rohitwaghchaure/cherry_pick_test_case_fix 
fix: cherry-pick item variant test cases fix
 2019-03-29 19:32:30 +05:30
Rohit Waghchaure
cc59fcd75e fix: user not able to create chart of account in parent if child has no chart of account 2019-03-29 19:23:04 +05:30
Rohit Waghchaure
fd2b1385a3 fix: user not able to create chart of account in parent if child has no chart of account 2019-03-29 19:20:47 +05:30
scmmishra
29dc744354 fix: healtcare unit type enable toggle 2019-03-29 19:00:45 +05:30
Himanshu
6343a697a2 fix(Salary Slip): Consider Leave without Pay for calculation (#16926) 
while net salary calculation, it was not considering actual days worked but now it will consider it
 2019-03-29 18:48:56 +05:30
rohitwaghchaure
13752774ab
Merge pull request #17000 from scmmishra/hotfix-task-status 
fix: Task overdue status propagates to project
 2019-03-29 18:44:36 +05:30
rohitwaghchaure
706cf7d3d2
Merge pull request #17001 from scmmishra/develop-task-status 
fix: task overdue status propagates to project
 2019-03-29 18:44:17 +05:30
Himanshu
6b54649bfe fix(Salary Slip): Consider Leave without Pay for calculation (#17023) 
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
 2019-03-29 18:32:23 +05:30
Rushabh Mehta
c4599c21c3 fix(test): item variant 2019-03-29 18:30:00 +05:30
Nabin Hait
92797eee87
Merge pull request #17052 from deepeshgarg007/patch-fix 
fix: Add patch to move item tax to item tax template
 2019-03-29 16:37:17 +05:30
Rushabh Mehta
1c68ddc9c0
Merge pull request #17045 from rmehta/fix-sla-auto-update 
fix(sla): update agreement status on save'
 2019-03-29 16:25:40 +05:30
Himanshu Warekar
95003cbbca fix: get credit and debit as float and not string 2019-03-29 16:21:59 +05:30
Himanshu Warekar
f7f85f7379 fix: get credit and debit in float and not string 2019-03-29 16:19:15 +05:30
deepeshgarg007
4092ead41e fix: fetch account only if available 2019-03-29 16:19:04 +05:30
Faris Ansari
eec89ba4cb Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-leave-application-condition 2019-03-29 16:06:38 +05:30
Rushabh Mehta
048e5f44b5 fix(test): item variant 2019-03-29 14:34:14 +05:30
rohitwaghchaure
e38c0e8716
Merge pull request #17053 from rohitwaghchaure/pos_items_not_loading_v12 
fix: POS items not loading
 2019-03-29 13:54:11 +05:30
Rohit Waghchaure
b00c16470d fix: POS items not loading 2019-03-29 13:47:45 +05:30
Nabin Hait
7b2c52b6f2 Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop 2019-03-29 13:26:46 +05:30
Nabin Hait
862f77cc13 Merge branch 'deferred_revenue' into hotfix 2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700 fix(accounts): Indentation 2019-03-29 13:25:11 +05:30
Nabin Hait
d4e038b6ca Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop 2019-03-29 12:41:48 +05:30
Nabin Hait
cf7538c17f
Merge pull request #17046 from nabinhait/deferred_revenue 
Refactor: deferred revenue booking logic
 2019-03-29 12:39:36 +05:30
deepeshgarg007
4f1926bcfe fix: Add patch to move item tax to item tax template 2019-03-29 12:10:44 +05:30
rohitwaghchaure
043cfe99ad
Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue 
fix: accounts receivable summary
 2019-03-29 09:28:21 +05:30
Rohit Waghchaure
9da14747aa fix: accounts receivable summary 2019-03-29 09:26:40 +05:30
Rohit Waghchaure
573d1dd31f fix: bank reconciliation not working 2019-03-28 20:39:49 +05:30
Nabin Hait
86fb523ea7 fix(accounts): codacy fixes 2019-03-28 20:06:57 +05:30
Nabin Hait
0a90ce5cf6 Refactored deferred revenue booking logic 2019-03-28 19:43:02 +05:30
Rushabh Mehta
cf33f4fd53 fix(sla): update agreement status on save' 2019-03-28 18:49:23 +05:30
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
Faris Ansari
f04988a02f fix: Missing "and" in filter conditions 2019-03-28 15:42:07 +05:30
Suraj Shetty
6262c9ed6a fix: Subquery in get_bom_items method 2019-03-28 14:59:27 +05:30
Saurabh
84a18f5b18 Merge branch 'master' into develop 2019-03-28 13:54:34 +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
Sagar Vora
d20ecb0a71 fix(accounts): dependent field should be displayed after source link field 2019-03-27 17:42:42 +05:30
Rohit Waghchaure
1b7059b867 fix: ImponibileImporto calculation 2019-03-27 15:33:47 +05:30
scmmishra
1b63c87929 feat: refactored update status 2019-03-27 15:04:55 +05:30
scmmishra
2405e14dde Merge branch 'hotfix-task-status' of github.com:scmmishra/erpnext into hotfix-task-status 2019-03-27 15:02:35 +05:30
scmmishra
36824cf7fb feat: refactored update status 2019-03-27 15:01:40 +05:30
Himanshu Warekar
a86f3a7d80 remove issue credit note 2019-03-27 10:01:18 +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
Himanshu Warekar
1b05ed042f Cost Center as per company 2019-03-26 20:25:54 +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
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
Mangesh-Khairnar
324e06cba0 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-03-25 18:51:13 +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
Mangesh-Khairnar
b3ec508655 feat: record reason for hold as comment 2019-03-25 17:29:14 +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
Mangesh-Khairnar
c423d6f2e4 fix: validate sales order linked work order creation on server side 2019-03-25 17:27:33 +05:30
Mangesh-Khairnar
bcb8b135f2 feat: ask reason for putting sales order on hold 2019-03-25 17:27:16 +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
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
Rushabh Mehta
689490e4de
Merge pull request #16986 from hrwX/italy_xml_fix 
fix(Italy Customisation): Include fiscal code in invoice xml if present
 2019-03-25 11:57:30 +05:30
deepeshgarg007
4f9ac0ad55 fix: Child company account currency fix 2019-03-25 11:39:25 +05:30
Shivam Mishra
ec56122876
fix: minor fix in test 2019-03-25 11:36:43 +05:30
scmmishra
26e5c753db fix: Typo in update_status 2019-03-25 11:35:28 +05:30
scmmishra
1af3c41da3 fix: Typo in update_status 2019-03-25 11:34:33 +05:30
Suraj Shetty
67876d1026 fix: Show amount of entry based on diff of credit and debit 2019-03-25 11:19:07 +05:30
scmmishra
f7f32634c8 feat: Added check for no end date and refactored query 2019-03-24 20:43:15 +05:30
scmmishra
a2e801e840 fix: Added check for no end date 2019-03-24 20:38:47 +05:30
scmmishra
5869ba1470 feat: Added filter to query 2019-03-24 20:27:32 +05:30
scmmishra
e7cf06b3c6 fix: task overdue status propagates to project 2019-03-24 18:23:41 +05:30
scmmishra
6ab6d35f92 fix: Task Overdue status propagates to project 
- Used ORM instead of a SQL for set_task_as_overdue
- update_status function compares the time and marks the appropriate task as overdue
- The on_update hook makes the changes in project as well
 2019-03-24 18:17:13 +05:30
rohitwaghchaure
6fabcdd5b3
Merge pull request #16978 from rohitwaghchaure/sales_partner_wise_reports 
feat: sales partner reports
 2019-03-24 14:52:45 +05:30
rohitwaghchaure
9673d0ddae fix: description missing in the XML (#16985) 2019-03-24 12:19:58 +05:30
Himanshu Warekar
92593bb717 fix: Cost center as per company 2019-03-23 19:46:31 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Frappe Bot
021ccf572a bumped to version 11.1.16 2019-03-23 07:25:02 +00:00
Zarrar
963d62b701 feat: Chart of Accounts Importer (#16623) 
* bare doctype created for COA utility

* improvise doctype's design

* validation to check no transaction exist for the company

* download file and import coa - client side logic added

* download csv template to create custom chart

* read the custom csv uploaded and parse it to appropriate format

* convert list of list to nested tree structure

* preview the uploaded chart before actual import

* toggle field based on necessity

* tweak create_charts and build_json logic to incorporate COA Import utility

* code cleanify and validation call added

* code enhancement for flexibility and validation added

* show import button only if data is validated

* unset existing data and load new accounts

* disable coa fields if parent_company set, minor improv

* file api fix

* added progress bar

* codacy fixes

* fix: Add account number in template

* fix: TDS account exception handling fix
 2019-03-23 10:30:12 +05:30
Himanshu
138e030055
CodiceFiscale should be after IdFiscaleIVA 2019-03-22 23:22:52 +05:30
Saif Ur Rehman
7d1c1aa28f fix(Party Ledger Summary): Show all adjustment entries as columns 
Consider only Income Account or Expense Account account type for adjustment amounts
Check if GL Entry's is_opening == "Yes"
 2019-03-22 17:18:32 +05:00
Himanshu Warekar
1d04ea1212 fix: include fiscal code in invoice xml if present 2019-03-22 17:47:57 +05:30
rohitwaghchaure
56e491bccd
Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields 
feat: enabled allow on submit for action fields in the Budget
 2019-03-22 15:34:41 +05:30
Prateeksha Singh
cc1a022d63 fix: correct use of include_item_in_manufacturing 2019-03-22 14:58:22 +05:30
Rushabh Mehta
d562e9530e fix(link): help link in selling 2019-03-22 14:46:12 +05:30
Rushabh Mehta
c0de5b741e fix: remove gitter chat 2019-03-22 14:32:00 +05:30
Nabin Hait
95705412f3 fix(uom): Get items as per UOM defined in BOM, fixes #15081 2019-03-22 13:19:17 +05:30
Rushabh Mehta
da87a491ab
Merge pull request #16816 from finbyz/hotfix 
fix: Rounding adjustment in Rounded Total
 2019-03-22 12:51:09 +05:30
Rushabh Mehta
2537b7fce8
Merge branch 'develop' into hotfix-work-order-item-name 2019-03-22 12:48:56 +05:30
Rushabh Mehta
7678c7b179
Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt 
fix: purchase receipt not able to submit because default inventory account has not selected in another company
 2019-03-22 12:47:06 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 
feat: Brand Item Defaults (v12)
 2019-03-22 12:46:04 +05:30
Rushabh Mehta
ff04142d9b
Merge pull request #16848 from alyf-de/hotfix-1 
fix(projects): change fieldtype of billing amounts to Currency
 2019-03-22 12:44:18 +05:30
Rushabh Mehta
7defd6f3b5
Merge pull request #16749 from Alchez/hotfix-cancelled-payments 
fix(payments): Only check for Draft or Submitted payments while cancelling payment requests
 2019-03-22 12:43:52 +05:30
Rushabh Mehta
b0a7cbb591
Merge pull request #16905 from frappe/netchampfaris-patch-1 
fix: Update Training Level
 2019-03-22 12:43:00 +05:30
Rushabh Mehta
199aae0fe8
Merge pull request #16861 from Anurag810/asset_fixes 
fix: passing the correct argument in get_depreciation_amount
 2019-03-22 12:42:46 +05:30
Rushabh Mehta
fc4eefcb22
Merge pull request #16871 from rmehta/attendance-from-leave 
feat: Pre mark attendance for Leave Application
 2019-03-22 12:41:47 +05:30
Rohit Waghchaure
9c214b6129 feat: enabled allow on submit for action fields in the Budget 2019-03-22 12:08:09 +05:30
Rushabh Mehta
2f9c7171fa
Merge pull request #16980 from chdecultot/fec_correctioon 
fix: [Regional] [FEC report] Mapping issue in sql query
 2019-03-22 12:05:51 +05:30
Deepesh Garg
22b61607c6 feat: GSTR3B Report JSON creation and Print Format (#16595) 
* feat: Created doctype for GSTR3B report and added boilerplate code

* feat: Updated gst_fields and patches for gst_category

* feat: Functions for calculating itc amount

* fix: Patched eligibility_for_itc_field

* fix: Updated set_category for gst

* fix: Function for setting iter_state supplies

* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format

* fix(style): Added missing semicolon and removed unused imports

* fix: Patch field only if column is available

* fix: Make custom fields only for india sepecific company

* fix: Add intro to gstr3b report

* fix: Updated patch in patches.txt

* fix: Update patches.txt

* fix: Update patch to set GST Category

* fix: Add fields for nil rated and non gst in item master

* fix: Added logic for nil rated and non gst inward flow

* fix: Initial test case for GSTR3B Report

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Add link for gstr_3b_report in accounting module

* fix: Updated report template

* fix: Changes in GSTR3B Report doctype

* fix: Added function to get missing field invoices

* fix: Added more test cases

* fix: Item not found error in test case

* fix: Key error in state numbers

* fix: Changes in GSTR3b Doctype

* fix: Changed functions to method

* fix: Minor fix in patch

* fix: Add gst_ctegory in GST Reports

* fix: Minor fixes in patch and itc_mapping

* fix: Query to patch itc field

* fix: Patch registered customers and fix for multiple gst accounts

* fix: Test case

* fix: Total taxable calculation logic fix and template enhancement

* fix: Calculate txval seperately

* fix: itc amount calculation fix and patch improvement

* fix: Updated test_cases for itc calculation

* fix: Missing field query

* fix: Multiple minor fixes inreport

* fix: Added transalations in GSTR3B-Form

* fix: Use double underscore for translation

* fix: GST fields ordering fix

* fix: Print form precision fix and get_period function fix
 2019-03-21 20:47:47 +05:30
Charles-Henri Decultot
a7cf7fbccc Fix: Mapping issue in sql query 2019-03-21 13:28:14 +00:00
Deepesh Garg
3a05b3501c
fix: Failing test case on develop (#16974) 2019-03-21 12:53:12 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Saurabh
83cc587f8f bumped to version 11.1.15 2019-03-20 15:03:00 +06:00
Faris Ansari
3ba91d7e19 fix: Add /all-products to sitemap 2019-03-20 14:11:22 +05:30
Faris Ansari
d77fe38513 fix: Remove no_sitemap property 2019-03-20 14:11:05 +05:30
rohitwaghchaure
f45db71ba2
Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working 
fix: Cost center from PO to PI is not mapping
 2019-03-20 13:40:05 +05:30
Rohit Waghchaure
f288866130 fix: Cost center from PO to PI is not mapping 2019-03-20 13:34:28 +05:30
Mangesh-Khairnar
2ffa87ea34 feat: added erpnext doctype via hooks (#16930) 2019-03-20 13:25:48 +05:30
Rohit Waghchaure
65d9435fd5 feat: sales partner reports 2019-03-20 12:05:21 +05:30
itusedyetnew
8aafbd22de
stock_values_on append function on string 2019-03-20 11:10:41 +05:30
Rohit Waghchaure
ca9f93cdc2 feat: Stock ageing warehouse wise 2019-03-20 02:14:54 +05:30
rohitwaghchaure
e521f51e5f
Merge pull request #16955 from rohitwaghchaure/sales_person_showing_wrong_on_ars 
fix: Accounts receivable report, remarks showing in the sales person column
 2019-03-19 18:17:15 +05:30
Mangesh-Khairnar
7fc1bc0b27 fix: handle an empty match query condition in leave application (#16931) 2019-03-19 18:14:02 +05:30
Rohit Waghchaure
a322687897 fix: Accounts receivable report, remarks showing in the sales person column 2019-03-19 18:10:08 +05:30
Himanshu
f3e5213190 feat(Support): Service Level Agreements (#16828) 
* init SLA

* Added more inputs to the forms

* set priority of issue

* Removed UOM in favor of hours for tracking

* updated js to autofill values

* Removed unwanted fields

* timer functionality

* code refactor

* parenthesis fix

* fixed typo

* added new fields

* Updated fields

* Updated fields for issue doctype

* Updated fields for issue doctype

* changed doctype structure

* added new fields to issue

* code refactor

* new function to set criticality level

* changed dropdown options

* set timer for sla

* calculation of resolution and response time

* stopwatch counter

* dashboard changes

* renamed sla to support contract

* countdown timer section

* issue doctype changes

* removed unwanted imports

* fixed wrong response time and resolution time

* update response and resolution time

* calculate time to respond and resolve

* feature enhancements

* probable scheduling bug fix

* fixed scheduling issue support sent out of support time

* removed issue criticality link from support

* Changed day order

* skip date validation when support contract is default

* removed mandatory field

* fix scheduling conditions for now

* code refactor

* removed duplicate doctypes

* fixed day inserted twice in service level

* check to not add another default contract

* default support contracts

* removed commented code

* removed unused imports

* fix sla for non-listed days

* reduced redundant code and optimized it and starting unit tests

* added condition check to compute days correctly

* renamed doc as per guidelines and added conditions for scheduling

* removed per day support timings

* added response and resolution time to support contract

* scheduling based on hours kinda fix

* set sla before_update and finally fixed time scheduling out of support time

* DocType Issue removed test_records and rewrote test cases

* test cases and codacy fixes

* Doctype SLA instead of Support Contract to avoid confusion with Contract

* fixed tests failing due to change in options for time period

* change naming to Prompt

* remove unknown doctype from help_desk

* revert unwanted changes to default

* refactor get_list for fetching service_level_agreement

* change datatypes

* fix tests

* refactored tests

* remove unused imports

* code and comments refactor for better understandability

* removed and renamed doctype to service days and minor fixes

* Refactor test cases for response and resolution time for issue

* add validation to check if response time < resolution time

* minor fix for checking if current day is start day

* calculate time in js rather than python

* fix: parenthesis fixing customer dashboard

* json changes to rename sections

* refactor: alignment

* refactor: beautify code

* fix: use frm api to get the element

* fix: replace '__' with '_'

* refactor: remove pointless test
 2019-03-19 16:47:56 +05:30
rohitwaghchaure
40046721b2
Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors 
fix: POS, cost center not added against debtors
 2019-03-19 16:38:07 +05:30
Rohit Waghchaure
8808a3fc8e fix: POS, cost center not added against debtors 2019-03-19 15:32:05 +05:30
rohitwaghchaure
4904ce649e
Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt 
fix: advance amount is not calculating properly
 2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a fix: advance amount is not calculating properly 2019-03-19 15:06:01 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
Himanshu Warekar
642a5b69f5 fix: change customer to supplier 2019-03-18 21:53:33 +05:30
Himanshu Warekar
2f5f17fcbb refactor: fix issue credit note 2019-03-18 21:46:26 +05:30
Rushabh Mehta
f060831cce fix(escaping): make_italian_localization_fields.py 2019-03-18 18:04:34 +05:30
Rohit Waghchaure
5b43e2f31a code cleanup 2019-03-18 17:00:44 +05:30
rohitwaghchaure
2046024de9
Merge pull request #16942 from hrwX/invoice-creation-tool 
fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation
 2019-03-18 15:48:55 +05:30
Himanshu
ac199580af fix(Customer Ledger): ambiguous error in where clause (#16914) 
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
 2019-03-18 15:44:54 +05:30
rohitwaghchaure
ac9f38bfc2
Merge pull request #16940 from rohitwaghchaure/added_cost_center_filters_in_ar_ap 
feat: added cost center filter in AR/AP reports
 2019-03-18 14:22:15 +05:30
Rohit Waghchaure
d4e4316d0b fix: test cases and codacy 2019-03-18 14:18:49 +05:30
Zlash65
01086ff60c codacy fixes 2019-03-18 12:50:29 +05:30
Zlash65
11bba571af test case added to check account syncing 2019-03-18 12:50:29 +05:30
Zlash65
cc65447e62 fix: chart of accounts field toggling improv 2019-03-18 12:50:29 +05:30
Zlash65
f71cb8dc6d fix: return if no descendants found 2019-03-18 12:50:28 +05:30
Zlash65
73acb8c837 fix: set chart of accounts based on parent company on server side 2019-03-18 12:50:28 +05:30
Zlash65
d787ef8b8e feat: sync account created for a group company to all its descendants 2019-03-18 12:50:28 +05:30
Zlash65
88c990901d fix: added validation to if account is being added to child company 2019-03-18 12:50:28 +05:30
Zlash65
0407bf1e00 fix: override primary action button, change filter to root company 2019-03-18 12:50:27 +05:30
Zlash65
2def228da8 feat: allow adding account only if topmost parent company 
- hidden filter for Parent Company added
- Add button overriden with new condition
 2019-03-18 12:50:27 +05:30
Zlash65
a57d58f756 feat: once company is saved, parent_company cannot be selected 2019-03-18 12:50:27 +05:30
Zlash65
1a4bfdd090 feat: selecting parent_company should disable chart_of_accounts based fields 2019-03-18 12:50:27 +05:30
Himanshu Warekar
aa03ea2a56 disbale pl check for Sales and Purchase Invoice 2019-03-18 12:36:42 +05:30
Rohit Waghchaure
ace95d5a67 feat: added cost center filter in AR/AP reports 2019-03-18 12:21:00 +05:30
Mangesh-Khairnar
db96db2897 style: change position of hold and resume button 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
e613c4f380 test: purchase order on hold 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
873c579bb4 fix: check for both hold and closed status in po 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
4f74313baf feat: record reason for hold as comment 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
a1afd78723 feat: add validation for on hold purchase order 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
439546c83c feat: add on hold status in purchase order 2019-03-18 12:14:25 +05:30
Aditya Hase
42640cb908 fix(dashboard): Add configuration to chart source 2019-03-18 11:18:43 +05:30
Deepesh Garg
3ead70ba3c
fix: Change IBAN Account length from 25 to 30 (#16847) 2019-03-18 08:22:57 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix (#16935) 2019-03-17 09:49:24 +05:30
Mangesh-Khairnar
b343407236 refactor: change validate email add to validate email address 2019-03-16 13:40:58 +05:30
rohitwaghchaure
fd33c55760
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit 
feat: added provision to disable CWIP accounting in asset settings
 2019-03-16 12:18:36 +05:30
rushin29
08a209bc52 fix: gst_state_number for address with Unregistered GST (#16798) 2019-03-15 15:28:50 +05:30
rohitwaghchaure
ef74e94374
Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card 
feat: child table to add multiple time logs in job card
 2019-03-15 11:46:33 +05:30
Rushabh Mehta
349a1157ef
Merge pull request #16717 from jigartarpara/fix_payment_term_template 
fix: Add credit month in validation
 2019-03-15 09:03:54 +05:30
Rushabh Mehta
b7abdf1222
Merge pull request #16851 from JoyceBabu/develop 
fix: Add 'Half-Yearly' option to Earned Leave Frequency
 2019-03-15 09:02:43 +05:30
Rushabh Mehta
957a3307ae
Merge pull request #16634 from Alchez/hotfix-stock-balance-balance 
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
 2019-03-15 09:02:20 +05:30
Rushabh Mehta
59a3012a5c
Update payment_request.py 2019-03-15 08:57:49 +05:30