Commit Graph

36461 Commits

Author SHA1 Message Date
Shariq Ansari
261c42186f
fix: updating phone icon setup logic for readonly fields ()
* fix: updating phone icon setup logic for readonly fields

* fix: sider fix
2021-03-09 20:28:00 +05:30
Jannat Patel
fa73074250
fix: salary structure assign to employee ()
* fix: salary structure assign to employee

* fix: pass data from dialog
2021-03-09 20:27:29 +05:30
Raffael Meyer
79b5be1830
fix: Group German VAT Accounts ()
* fix: group account for tax assets and liabilities (germany)

* fix: spacing
2021-03-09 20:26:43 +05:30
Deepesh Garg
06a6ee37cb
fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool () 2021-03-09 20:23:26 +05:30
Deepesh Garg
47c6d2e00f
Merge pull request from AfshanKhan/fix-tds-computation-summary
fix: sending proper arguments for TDS Computation Summary report
2021-03-09 20:01:30 +05:30
Deepesh Garg
6249798d84
Merge pull request from ankush/dont_update_pe_title
fix: do not update PE title during data import
2021-03-09 19:47:21 +05:30
Deepesh Garg
79005a4a76
Merge pull request from resilient-tech/fix-company-breadcrumbs
fix: breadcrumbs for company
2021-03-09 19:46:39 +05:30
Marica
dfc5c45e50
Merge pull request from shariquerik/item-attribute-fix
fix: item attributes not editable until refresh
2021-03-09 18:44:59 +05:30
Marica
e1ee9034ef
Merge branch 'develop' into item-attribute-fix 2021-03-09 18:35:44 +05:30
Marica
916b75a3a3
Merge pull request from ankush/salary_slip_error
chore: improve error message for missing fields.
2021-03-09 18:23:09 +05:30
Marica
5accf8adf5
Merge branch 'develop' into salary_slip_error 2021-03-09 18:20:54 +05:30
Ankush Menat
9b4e5bfa87
chore: improve error message for missing fields. 2021-03-09 13:59:14 +05:30
Marica
9d0a93dd92
Merge pull request from danielchalmers/patch-6
fix: Remove obsolete section titles from Quality Meeting doctype
2021-03-09 13:36:38 +05:30
Marica
5471265f92
Merge branch 'develop' into patch-6 2021-03-09 13:32:23 +05:30
walstanb
be98ee26cd fix: breadcrumbs for company 2021-03-09 13:03:52 +05:30
Marica
baa406e99f
Merge pull request from alyf-de/set_value_instead_of_sql
fix: use set_value instead of sql
2021-03-09 11:54:31 +05:30
barredterra
99c8b8efcf Merge branch 'develop' into improve_taxes_setup 2021-03-08 20:00:59 +01:00
barredterra
ebd1d08e55 refactor: taxes setup
Better structure of input data.
2021-03-08 19:53:50 +01:00
Afshan
d1fb363a37
Merge branch 'develop' into fix-tds-computation-summary 2021-03-08 22:50:04 +05:30
Deepesh Garg
98cc7b1751
Merge pull request from AfshanKhan/fix-get_round_off_applicable_accounts-arguments
fix: call get_round_off_applicable_accounts() function when arguments available
2021-03-08 22:20:25 +05:30
Afshan
d95b59e90c fix: call function when arguments available 2021-03-08 18:19:53 +05:30
Ankush Menat
afc766bbf1
Merge branch 'develop' into dont_update_pe_title 2021-03-08 15:44:15 +05:30
Ankush Menat
5571b988dd
fix: make title field read only 2021-03-08 15:43:03 +05:30
Ankush Menat
cc46866cd9
fix: do not update PE title during data import
Related issue: ISS-20-21-10132
2021-03-08 15:42:39 +05:30
Afshan
1002e36c53 fix: removed unused import 2021-03-08 14:39:19 +05:30
Afshan
fa932e2a3e fix: sending proper arguments for report 2021-03-08 14:36:40 +05:30
Deepesh Garg
48b0f0da96
Merge pull request from ankush/gst_invoice_validation
fix: Add warning for invalid GST invoice numbers
2021-03-07 18:09:00 +05:30
rohitwaghchaure
15c0199e07
Merge pull request from rohitwaghchaure/minor-fixes-for-work-order
fix: minor changes in work order
2021-03-07 12:53:29 +05:30
Rohit Waghchaure
4c089b5852 minor fixes 2021-03-07 12:17:59 +05:30
Deepesh Garg
45870317f2
Merge pull request from UrvashiKishnani/patch-1
fix: total row in AR/AP summary report
2021-03-06 21:28:04 +05:30
Saqib
92b0691c68
fix: einvoice button visiblity condition () 2021-03-06 19:00:08 +05:30
Deepesh Garg
36a0085905
Merge pull request from danielchalmers/patch-8
fix: typo in Charts of Account doctype
2021-03-06 13:11:26 +05:30
Deepesh Garg
3e0a9383b4
Merge pull request from ankush/track_settings
fix: track setting changes
2021-03-06 13:09:58 +05:30
Deepesh Garg
9cbdfe17e4
Merge pull request from alyf-de/tax_category_quick_entry
fix: make quick entry for Tax Category work
2021-03-06 13:04:58 +05:30
Saurabh
202ef92fa1 Merge branch 'version-13-beta-pre-release' into version-13-beta 2021-03-05 09:34:01 +05:30
Saurabh
4e1206bf21 bumped to version 13.0.0-beta.13 2021-03-05 09:54:01 +05:50
barredterra
25afad3dc1 refactor: extend taxes and charges setup
Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.
2021-03-04 21:11:31 +01:00
barredterra
dcfc3d7d12 fix: remove redundant calls to create_sales_tax 2021-03-04 19:29:55 +01:00
Saqib Ansari
49e4693abf fix(patch): updating pos closing reference in merge log 2021-03-04 11:58:45 +05:30
Daniel Chalmers
9b4a258c89
Chart Of Accounts -> Chart of Accounts 2021-03-04 00:15:46 -06:00
UrvashiKishnani
27ea23223d
fix: total row in AR/AP summary report 2021-03-04 09:21:25 +04:00
Raffael Meyer
f1d13a4ff3
Merge branch 'develop' into track_settings 2021-03-03 12:40:37 +01:00
barredterra
1521b31795 fix: use set_value instead of sql 2021-03-03 12:33:48 +01:00
barredterra
53d261702a fix: make quick entry for Tax Category work 2021-03-03 11:52:48 +01:00
Ankush Menat
7c4c42ad67
refactor: move regex patterns to global variables 2021-03-03 14:56:19 +05:30
Ankush Menat
7c78220eac
Merge branch 'develop' into gst_invoice_validation 2021-03-03 13:38:14 +05:30
Ankush Menat
9b3f5d5f67
test: add tests for gst invoice name checks 2021-03-03 13:36:59 +05:30
Ankush Menat
a44df63a91
fix: Add warning for invalid GST invoice numbers
GST Invoice numbers should be 16 characters alphanumeric with dash(/) or
slash(-) only. Add check for doc.name before saving and warn about
naming series.
2021-03-03 11:26:12 +05:30
Deepesh Garg
82c6223196
Merge pull request from ankush/no_team_updates
fix(HR): hide "more" button from team updates
2021-03-02 18:55:34 +05:30
Deepesh Garg
ecde26409b
Update team_updates.js 2021-03-02 18:54:50 +05:30