Commit Graph

32200 Commits

Author SHA1 Message Date
Deepesh Garg
d6da1a93ae chore: version bump v12.31.0 2022-06-14 16:24:13 +05:30
Deepesh Garg
5af2b74039 Merge pull request #31352 from frappe/version-12-hotfix
chore: version-12 release
2022-06-14 16:19:50 +05:30
Marica
1ee62a8342 Merge pull request #31280 from RJPvT/patch-2
fix: locale Currency and Float setting in update_employee
2022-06-09 18:29:56 +05:30
RJPvT
74748c03e2 fix: locale Currency and Float setting in update_employee
In fieldtypes locale settings (example NL) . and , changes whereby the field is inproperly filled
2022-06-08 10:55:15 +02:00
mergify[bot]
73484ef1bc fix(india): e-invoice eligibility if company gstin is not configured (#31276) 2022-06-08 12:55:16 +05:30
mergify[bot]
1c25d7c6f2 fix(india): error while parsing e-invoice (backport #31053) (#31224) 2022-06-06 14:28:40 +05:30
mergify[bot]
432210d13d fix(india): minor e-invoicing fixes (backport #30553) (#31067) 2022-05-19 14:26:38 +05:30
mergify[bot]
836bfc603a fix(stock_ledger): round off values near to zero (#30803)
(cherry picked from commit 6a014d12c1)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2022-04-26 10:16:06 +05:30
mergify[bot]
2d7c678a9d fix: warehouse naming when suffix is present (#30621) (#30768)
(cherry picked from commit be04eaf723)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-04-21 12:04:25 +05:30
Ankush Menat
a92c53dd2b chore: disable coverage
coverage adds overhead which isn't necessary on v12 branch now

[skip ci]
2022-04-21 11:41:08 +05:30
mergify[bot]
68fd8a1dcf fix(india): transporter name is null while generating e-way bill (backport #30736) 2022-04-20 19:48:22 +05:30
Ankush Menat
619c178049 chore: bump version v12.30.1 2022-04-10 11:54:57 +05:30
Ankush Menat
579a2366f6 Merge branch 'v12-pre-release' into version-12 2022-04-10 11:54:30 +05:30
mergify[bot]
6ad2684121 fix: dont fetch entire barcode table in get_item_details (#30131) (#30667)
(cherry picked from commit 64905188c4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-04-10 11:53:28 +05:30
mergify[bot]
5b2b76c4a7 fix: dont fetch entire barcode table in get_item_details (#30131) (#30666)
(cherry picked from commit 64905188c4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-04-10 11:52:35 +05:30
Deepesh Garg
5bedb88e62 chore: version bump and release notes 2022-03-28 23:27:54 +05:30
Deepesh Garg
0c4a61d4e6 Merge pull request #30456 from frappe/version-12-hotfix
chore: Release for v12.27.0
v12.30.0
2022-03-28 19:20:52 +05:30
Saqib Ansari
c8780b0062 Merge pull request #30401 from nextchamp-saqib/add-client-cred-fields-einvoicing
feat: add client id & client secret fields in e invoice settings
2022-03-25 10:28:57 +05:30
Saqib Ansari
f531d1a69b feat: add client id & client secret fields in e invoice settings 2022-03-24 17:50:05 +05:30
Rucha Mahabal
51aa55f3b0 fix: salary slip amount rounding errors (#30250) 2022-03-15 12:23:48 +05:30
Saqib Ansari
db0e3d3fbe Merge pull request #30088 from frappe/mergify/bp/version-12-hotfix/pr-30084
fix(e-invoicing): remove batch no from e-invoices (backport #30084)
2022-03-07 11:57:29 +05:30
Saqib Ansari
ccffcf2596 fix(e-invoicing): remove batch no from e-invoices
(cherry picked from commit 031a0dd703)
2022-03-07 06:25:43 +00:00
Rohit Waghchaure
1413af8f3a Merge branch 'v12-pre-release' into version-12 v12.29.0 2022-02-15 22:29:43 +05:30
Rohit Waghchaure
9a1afeb13b bumped to version 12.29.0 2022-02-15 22:49:43 +05:50
rohitwaghchaure
13a9b304b7 Merge pull request #29817 from rohitwaghchaure/change-log-for-v12-29
chore: change log for v12.29.0
2022-02-15 22:27:38 +05:30
Rohit Waghchaure
ee7ac93ff3 chore: change log for v12.29.0 2022-02-15 19:49:04 +05:30
rohitwaghchaure
3aa4411a0d Merge pull request #29602 from rohitwaghchaure/merge-branch-hotfix-to-pre-release-for-12-29
chore: merge branch 'version-12-hotfix' into 'v12-pre-release'
2022-02-03 13:06:56 +05:30
Rohit Waghchaure
7db947550b chore: merge branch 'version-12-hotfix' into 'v12-pre-release' 2022-02-02 23:20:27 +05:30
Saqib Ansari
c74a6f1827 Merge pull request #29291 from GangaManoj/prevent-depr-of-sold-assets
fix: Display 'Make Depreciation Entry' only for submitted or partially depreciated Assets
2022-01-14 18:49:13 +05:30
GangaManoj
73243c8ac3 fix: Hide Make Depreciation Entry if the Asset is not in the Submitted or Partially Depreciated state 2022-01-14 17:40:59 +05:30
GangaManoj
1800ce2780 fix: Only allow posting of Depreciation Entries if the Asset is in the Submitted or Partially Depreciated state 2022-01-14 15:33:16 +05:30
Ankush Menat
e5ea16a6dd fix: loosen dependencies for pandas 2022-01-10 18:12:50 +05:30
Rohit Waghchaure
54cb62c7bf Merge branch 'v12-pre-release' into version-12 v12.28.0 2022-01-02 23:41:11 +05:30
Rohit Waghchaure
11ad77f491 bumped to version 12.28.0 2022-01-03 00:01:11 +05:50
rohitwaghchaure
95b0c743d4 Merge pull request #29097 from rohitwaghchaure/change-log-for-v12-28
chore: change log for v12.28.0
2022-01-02 23:38:20 +05:30
Rohit Waghchaure
fee83e8ba4 chore: change log for v12.28.0 2022-01-02 23:28:09 +05:30
rohitwaghchaure
4c5b5607ba Merge pull request #29074 from rohitwaghchaure/merge-hotfix-to-pre-release-for-12-28
chore: Merge branch 'version-12-hotfix' into 'v12-pre-release'
2021-12-30 11:27:41 +05:30
Rohit Waghchaure
00b40c0f3c fix: failing test case 2021-12-30 10:14:14 +05:30
Rohit Waghchaure
ac08379f2b chore: Merge branch 'version-12-hotfix' into 'v12-pre-release' 2021-12-29 23:40:23 +05:30
rohitwaghchaure
753adf3ce4 Merge pull request #29063 from rohitwaghchaure/fixed-backport-issue
fix: travis failing
2021-12-29 23:27:46 +05:30
Rohit Waghchaure
fbbf29e829 fix: travis failing 2021-12-29 15:46:14 +05:30
Ganga Manoj
ce2aa767b2 fix: Use depreciation cost center for creating credit entries in JEs (#28908) 2021-12-23 12:04:15 +05:30
Ankush Menat
c9927efcae test: dynamic fiscal year creation in tests (#28667)
(cherry picked from commit fdffa037b5)

fix: resolve conflict

fix
2021-12-14 22:50:26 +05:30
Rucha Mahabal
e9dbb46a06 fix: incorrect amount based on payment days in timesheet salary slip (#28884) 2021-12-14 20:04:37 +05:30
mergify[bot]
39125a78e0 fix!: dont allow renaming warehouse primary key (backport #28712)
* fix!: dont allow renaming warehouse primary key

(cherry picked from commit 72dbc3d6b8)

* fix: remove autocommit from item rename

(cherry picked from commit 5caf411be3)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-14 17:45:08 +05:30
Saqib
2a00164059 Merge pull request #28848 from frappe/mergify/bp/version-12-hotfix/pr-28797
fix: validate if asset account is set against company (backport #28797)
2021-12-13 22:41:15 +05:30
Saqib
7d1953bb3b fix: validate if asset account is set against company
(cherry picked from commit c3e0de28b1)
2021-12-13 14:44:48 +00:00
Deepesh Garg
33eeb64fec Merge pull request #28463 from frappe/mergify/bp/version-12-hotfix/pr-28459
fix(India): GST category not getting auto updated (backport #28459)
2021-12-03 09:39:09 +05:30
Rohit Waghchaure
bbffb5d91e Merge branch 'v12-pre-release' into version-12 v12.27.0 2021-12-02 20:30:31 +05:30
Rohit Waghchaure
260b9c1885 bumped to version 12.27.0 2021-12-02 20:50:31 +05:50