Commit Graph

38479 Commits

Author SHA1 Message Date
Deepesh Garg
354e2984c2
Merge pull request #26541 from deepeshgarg007/travis_tax_setup
fix: Typo and remove duplicate function
2021-07-19 10:42:58 +05:30
Deepesh Garg
2686d04800 fix: Typo and remove duplicate function 2021-07-18 17:54:35 +05:30
Deepesh Garg
ce79faa738
Merge pull request #26539 from dj12djdjs/fix-req-argument
fix: missing parameter 'country'
2021-07-18 17:48:22 +05:30
Anuja Pawar
2bbf48e835
Merge branch 'develop' into sa-vat-report 2021-07-18 11:13:25 +05:30
Devin Slauenwhite
d5ff636159 fix: missing parameter 'country' 2021-07-17 14:42:38 -04:00
GangaManoj
831f5edd02 fix: Remove unused imports 2021-07-17 22:55:24 +05:30
GangaManoj
cde0cc0678 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-17 22:53:21 +05:30
Ganga Manoj
bfb7256143
Merge branch 'develop' into enable-discount-accounting 2021-07-17 20:01:09 +05:30
GangaManoj
d6956ff075 fix: Add test for additional discount applied on taxes 2021-07-17 19:49:42 +05:30
GangaManoj
228499369c fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice 2021-07-17 19:49:16 +05:30
GangaManoj
99551e9b7f fix: Add test for additional discount applied on taxes 2021-07-17 18:45:21 +05:30
GangaManoj
c4d2dc0da3 fix: Remove unnecessary condition 2021-07-17 17:47:20 +05:30
GangaManoj
c2ba6897b0 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-17 17:45:35 +05:30
GangaManoj
fa4c03e7a1 fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries 2021-07-17 17:42:36 +05:30
GangaManoj
7bbc9a886d fix: Filter options for Additional Discount Account 2021-07-17 17:41:06 +05:30
GangaManoj
87d448e039 fix: Add Additional Discount Account field 2021-07-17 17:40:43 +05:30
GangaManoj
b0f21824bc fix: Check all expected GL Entries 2021-07-17 17:34:50 +05:30
Ankush
d8ed9dfcf4
chore: update CODEOWNERS (#26536) (#26537) 2021-07-17 12:49:56 +05:30
Ankush
70a7252469
chore: update CODEOWNERS (#26536) 2021-07-17 12:48:40 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Nabin Hait
4e6f49209f Merge branch 'version-13-pre-release' into version-13 2021-07-16 15:21:33 +05:30
Nabin Hait
e079a1bb33 bumped to version 13.7.0 2021-07-16 15:41:33 +05:50
rohitwaghchaure
ad12fd75a8
Merge pull request #26529 from rohitwaghchaure/patch-to-fix-missing-fg-item-develop
fix: added patch to fix missing FG item
2021-07-16 15:12:46 +05:30
Rohit Waghchaure
56e4a88956 fix: added patch to fix missing FG item 2021-07-16 15:06:57 +05:30
Nabin Hait
9ddf33715e
Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item
fix: added patch to fix missing FG item
2021-07-16 15:05:23 +05:30
Nabin Hait
e8abb201c1
Merge pull request #26526 from rohitwaghchaure/patch-to-fix-missing-fg-item-pre
fix: added patch to fix missing FG item
2021-07-16 15:05:16 +05:30
Noah Jacob
3362c080b6
fix: validation check when no conversion_factor (#26527) 2021-07-16 15:00:08 +05:30
Rohit Waghchaure
13e9aa5956 fix: added patch to fix missing FG item 2021-07-16 14:34:24 +05:30
Rohit Waghchaure
0c6ca09e06 fix: added patch to fix missing FG item 2021-07-16 14:33:25 +05:30
Nabin Hait
f6d6897f34
Merge pull request #26525 from nabinhait/change-log-v13-7-0
chore: Added change log for v13.7.0
2021-07-16 13:09:31 +05:30
Nabin Hait
a0df79ee8c chore: Added change log for v13.7.0 2021-07-16 13:07:39 +05:30
Ankush
627a8a8cfd
chore: disable semgrep on push events (bp #26523) 2021-07-16 13:03:18 +05:30
Ankush
a6d80dcc2a
chore: disable semgrep on push events (#26523) 2021-07-16 13:01:57 +05:30
rohitwaghchaure
9ed36627d2
Merge pull request #26521 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item-develop
fix: FG item not fetched in manufacture entry
2021-07-16 11:40:23 +05:30
Rohit Waghchaure
df5c2b9aaf fix: FG item not fetched in manufacture entry 2021-07-16 11:35:14 +05:30
rohitwaghchaure
bae2890389
Merge pull request #26514 from ankush/backport/develop/pr-26240
feat: provision to make subcontracted purchase order from the production plan (#26240)
2021-07-16 11:29:34 +05:30
Rucha Mahabal
2c3866a53e ci(cypress): use env variable for key
documentation ref: https://docs.cypress.io/guides/guides/command-line\#cypress-run
2021-07-16 10:32:38 +05:30
GangaManoj
56cdcebbf4 fix: Sider issues 2021-07-16 02:23:55 +05:30
GangaManoj
6bff653cf0 fix: Sider issues 2021-07-16 02:18:45 +05:30
GangaManoj
857501cbe1 fix: Make additional GL Entries for discount applied on taxes 2021-07-15 22:03:46 +05:30
GangaManoj
40412f7e61 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-15 22:02:43 +05:30
GangaManoj
8e96e2d5a2 fix: Filter options for Additional Discount Account 2021-07-15 22:01:38 +05:30
GangaManoj
4f2bf98966 fix: Add Additional Discount Account field 2021-07-15 22:01:02 +05:30
Rucha Mahabal
8961a267f6 fix: sider 2021-07-15 19:32:15 +05:30
Ankush
b164070a4f
ci: make semgrep ignore existing errors (bp #26516) 2021-07-15 19:31:59 +05:30
Ankush
1b5f3cf605
ci: make semgrep ignore existing errors (#26516) 2021-07-15 19:30:05 +05:30
Rucha Mahabal
ee7eaf9c70 test: UI tests for org chart mobile
fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level
2021-07-15 19:19:09 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan 2021-07-15 19:01:36 +05:30
Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor (#26219) 2021-07-15 18:32:15 +05:30
Afshan
9b9b18c286
fix: improving ux for additional discount field (#26502) 2021-07-15 18:11:22 +05:30