Commit Graph

29039 Commits

Author SHA1 Message Date
rohitwaghchaure
d064505ebe fix: incorrect produced qty in the production plan (#19569) 2019-11-13 18:17:48 +05:30
rohitwaghchaure
ba8fc21594 fix: merge similar entries for serialized items in stock reconciliation (#19408) 2019-11-13 18:11:58 +05:30
Nabin Hait
3a72cb46bc
fix: Set due date in accounts receivable based on payment terms (#19563) 2019-11-13 17:58:10 +05:30
Deepesh Garg
082bfb8cb3
Merge pull request #19567 from deepeshgarg007/balance_sheet_develop
fix: Accumulated Values filter disappearing
2019-11-13 17:46:46 +05:30
deepeshgarg007
5ea4328359 fix: Accumulated Values filter disappearing 2019-11-13 13:23:49 +05:30
rohitwaghchaure
ffbfaf7099 fix: email digest showing incorrect upcoming events (#19552) 2019-11-13 10:59:23 +05:30
Mangesh-Khairnar
06c8129574 fix(batch): fetch company on splitting the batch (#19558) 2019-11-13 10:51:43 +05:30
Marica
d00c59830e feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262)
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category

Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category

* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'

- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered

* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox

* fix(test): Asset

* fix: Asset Test and Patch

* fix(test): Opening Invoice Creation Tool

* Update asset.py

* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
rohitwaghchaure
010714757c fix: '<' not supported between instances of 'str' and 'NoneType' (#19553) 2019-11-12 18:20:07 +05:30
MorezMartin
4fa6194009 feat: [production_plan -> fetching item description] Fetch item description from Material Request or Sales Order (#19541)
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items

* Fetch description from Material Request or Sales Order in production plan, add the possibility to modify the description un production plan

* sync with fork

* Fetch description from Material Request or Sales Order in production plan, Add the possibility to modify description in production plan

* code cleaning syncing fork

* code cleaning syncing fork

* code cleaning syncing fork

* code cleaning syncing fork

* rewied and add item_details.description in case of blank field
2019-11-12 18:19:01 +05:30
Marica
29a2e16f62 fix: Add Serial No. button not responding (#19550) 2019-11-12 14:43:41 +05:30
Deepesh Garg
3cc3b57926 fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry (#19427)
* fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry

* fix: Codacy

* fix: Minor UX fixes

* fix: Also credit payable amount in case of advance payment

* fix: Against voucher in GL enrty
2019-11-12 14:32:50 +05:30
Deepesh Garg
2689acfc8e
Merge pull request #19549 from DeeMysterio/v12-emp-err
fix(employee): show only active employees in the error display while …
2019-11-11 21:50:07 +05:30
Diksha
39152f935c fix(employee): show only active employees in the error display while marking a reporting to employee as left 2019-11-11 19:22:51 +05:30
rohitwaghchaure
001ee5ee1b fix: dictionary changed size during iteration (#19546) 2019-11-11 17:43:48 +05:30
Mitchy25
a227b9a9a6 Fix Bank Reconcilaition for Payment Entries (#19190)
* Fix Bank Reconciliation with Payment Entries

* Update bank_reconciliation.js
2019-11-11 17:29:53 +05:30
ci2014
8b2223ae5f Move add_custom_button for Gantt and Kanban Board (#19193)
Move add_custom_button for Gantt and Kanban Board to set_buttons, because in onload it is not working.
2019-11-11 17:27:48 +05:30
Nabin Hait
f997b443e1 Merge branch 'finbyz-develop' into develop 2019-11-11 17:20:28 +05:30
Nabin Hait
4c7ac65db1 fix: Made Campaign for field mandatory 2019-11-11 17:19:52 +05:30
FinByz Tech Pvt. Ltd
88de00fb94 Rendered Email template in email Campaign 2019-11-11 17:17:21 +05:30
Tufan Kaynak
06c6f7cfd3 fix: Currency Exchange for_selling and for_buying on the same day (#19339)
* fix: test data of Currency Exchange to incluse buying and selling

test data of Currency Exchange to incluse buying and selling

* fix: Currency Exchange Test corrected to include selling and buying exchange_rate

Currency Exchange Test corrected to include selling and buying exchange_rate

* fix: Currency Exchange for_selling and for_buying fields test and functionality restored


In this fix:
* You can now add a separate exchange_rate in date for_selling and for_buying. You could not before because the unique field name was only calculated to allow a single name for a date
* tests did not account for for_selling and for_buying fields and thier uniqueness

* Update test_currency_exchange.py

* Update test_records.json

* fix: update test_records.json

* Update test_records.json

* The basic package for turkey is defined. It is empty now but applications specific to Turkey will be created under that package.

* fix: update code with scapes vs.tabs

updated the code regarding spaces issue

* Update currency_exchange.py
2019-11-11 17:11:16 +05:30
Saurabh
d3ed499854
Merge pull request #19416 from EconCode/shopify-connector-unregisterfix
fix: unregistering url wrong formatted string
2019-11-11 17:04:44 +05:30
Nabin Hait
32936024a0 patch: set default for add taxes from item tax template 2019-11-11 15:44:27 +05:30
Nabin Hait
8bd2d4d35e
fix(trial balance): Show opening and closing of group account in single column (#19509) 2019-11-11 10:59:20 +05:30
rohitwaghchaure
df75b7693a fix: added description, uom fields in material request plan item table (#19463) 2019-11-11 10:59:10 +05:30
Mangesh-Khairnar
2f44480d69 enhancement: Item-wise sales history report (#19500)
* refactor(item-wise-sales-history): convert query report to script report

* refactor: add columns, fetch data

* refactor: shift company set func to utils

* fix: add filters

* fix: minor changes

* fix: fetch all the descendants
2019-11-11 10:54:12 +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
rohitwaghchaure
b81942404d fix: incorrect balance qty in stock ledger if batch filter set (#19479) 2019-11-08 14:50:48 +05:30
rohitwaghchaure
d36c6068b2 fix: 'NoneType' object has no attribute 'stock_uom' (#19532) 2019-11-08 14:43:53 +05:30
Rohit Waghchaure
e93dc9f1cd fix: precision issue 2019-11-08 13:43:15 +05:30
Deepesh Garg
7a23057eab feat: Enhancement in landed cost voucher (#19252)
* feat: Enhancement in landed cost voucher

* fix: Make GL entries based on ledgers in Landed cost voucher

* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry

* fix: Ability to select expense account in Stock Entry

* fix: Renaming and test case fixes

* fix: Test Cases

* fix: Additional cost in Stock Entry

* fix: Changed filters and test case fixes

* fix: Upadte filters in stokc entry expense account filter

* fix: company filter
2019-11-08 12:52:54 +05:30
Deepesh Garg
7aef9f3b43 fix: Accounting Dimension custom fields should be admin owned (#19525)
* fix: Accounting Dimension custom fileds should be admin owned

* fix: Update query

* fix: Travis
2019-11-08 12:42:38 +05:30
Deepesh Garg
a839510b33
Merge pull request #19528 from deepeshgarg007/gst_check_digit_msg
fix: GSTIN validation msg fix
2019-11-07 23:05:23 +05:30
deepeshgarg007
62fbf37eb4 fix: GSTIN validation msg fix 2019-11-07 21:54:25 +05:30
Deepesh Garg
4a6c723310
Merge pull request #19527 from deepeshgarg007/gstr_1_error_fix
fix: Exception handling in GSTR-1 Report
2019-11-07 20:19:29 +05:30
deepeshgarg007
015285c42f fix: Exception handling in GSTR-1 Report 2019-11-07 19:38:52 +05:30
Rucha Mahabal
b455318f01 fix(Integration): Woocommerce issues (#19487)
* fix: Delivery URL returned response code 500

* fix: set default company in Woocommerce Settings

* fix: remove redundant function calls

* fix: make offset configurable for delivery date in sales order

* fix: remove redundant code from woocommerce_settings.py

* fix: import create_custom_field

* fix: added ignore_mandatory for saving item, customer and sales order

* fix: remove unused woocommerce_check custom field

* fix: do not delete custom fields or item group when sync is disabled
2019-11-07 18:20:32 +05:30
Nabin Hait
628701f1a5
fix: Accounts mandatory depending on share transfer type (#19523) 2019-11-07 18:05:40 +05:30
Himanshu
bac50bc295 fix: remove validate for issue priority (#19522) 2019-11-07 18:04:50 +05:30
Saurabh
28c6a0aeb1 fix: reload global defaults (#19517) 2019-11-07 14:16:26 +05:30
rohitwaghchaure
15382a6f71
Merge pull request #19518 from sahil28297/fix_cart
fix(cart): return rule instead of rule_label_map
2019-11-07 13:03:41 +05:30
Marica
52d888de42 fix[minor]: Payment Entry status patch (#19519) 2019-11-07 13:01:45 +05:30
Marica
e37a67245e fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note (#19388) 2019-11-07 12:52:23 +05:30
Sahil Khan
1c44bb0982 fix(cart): return rule instead of rule_label_map 2019-11-07 12:38:05 +05:30
theopen-institute
36520ef951 fix: Add a setting to make creation of new Student User optional (#19122)
* New setting to skip Student User creation

* Allow skip of new User creation via settings
2019-11-06 19:09:15 +05:30
Raffael Meyer
edba06038e feat(regional): enable transaction log for germany (#19198) 2019-11-06 19:07:04 +05:30
Mitchy25
a5776d16b4 fix: Version 12 Bank Reconciliation fix (#19182)
* Fix Bank Reconciliation

Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters

* Update bank_reconciliation.js

Removing incorrect fix to filters.

Filters are loaded from Bank Transaction List.

* Update bank_reconciliation.js
2019-11-06 19:04:54 +05:30
Suraj Shetty
7508896bfb perf: Optimise BOM Update Tool (#19236)
* perf: Optimize BOM update tool
- Remove redundant traverse_tree calls
- Cache bom_children data

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replace get_list with db.sql

* fix: Enable versioning for updated BOM

* fix: Directly save doc_before_save from bom obj instead of using  load_doc_before_save

* fix: recurssion check performance issue
2019-11-06 18:46:57 +05:30
Mangesh-Khairnar
a709ae894c feat: duplicate linked task in project (#19271)
* feat: create a duplicate project

* fix: allow duplication via form

* feat: fetch old task and link project

* fix: link task with project

* fix: parse json string as python object

* fix: avoid duplicate task based on the project template

* fix: ask user for the new project name

* fix: display a descriptive message on switching to a new route

* fix: override duplicate in menu

* fix: check for duplicate project name after submitting prompt

* fix: set the project template

* fix: minor changes

* fix: function call

* refactor: add a separate button for duplicate

* Update project.js
2019-11-06 18:20:06 +05:30
Deepesh Garg
02b9472152
Merge pull request #19490 from prssanna/dashboard-fix
fix: fix dashboard with date range
2019-11-06 18:17:08 +05:30