CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 23:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,161 Commits 415 Branches 1,717 Tags
cd0fcfd84cc5015fad41c6c96412317cc8ffeef0
Commit Graph

30161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Myuddin khatri
cd0fcfd84c solved merge conflicts 2020-05-07 16:11:08 +05:30
sahil28297
2aa045865f fix(item): patch to rename duplicate item_code values to name (#21619) 2020-05-07 12:11:23 +05:30
rohitwaghchaure
ec3a462acd fix: list index out of range (#21614) 2020-05-07 12:06:05 +05:30
Deepesh Garg
a6066009aa Merge pull request #21520 from nextchamp-saqib/sales-report-total-row-v12 
chore: add total row in sales analytics report
 2020-05-06 10:50:53 +05:30
Deepesh Garg
60b19fe935 Merge branch 'version-12-hotfix' into sales-report-total-row-v12 2020-05-06 10:48:38 +05:30
Deepesh Garg
70b52c37d5 Merge pull request #21606 from frappe/sahil28297-patch-1 
fix(patch): reload Expense Claim doctype
 2020-05-05 20:21:23 +05:30
sahil28297
178ad9b4d6 fix(patch): reload Expense Claim doctype 2020-05-05 20:07:48 +05:30
rohitwaghchaure
d476eb79b4 fix: against voucher no not all records showing in case of Group By Voucher (consolidated) (#21591) 2020-05-05 16:17:03 +05:30
Saqib
10ea82001f chore: fix error message (#21594) 
* chore: fix error message

* chore: add row idx
 2020-05-05 16:14:12 +05:30
Saqib
794bb6ebdd fix: handle make_gl_entry in case of cwip enable after puchasing (#21530) 
* fix: handle make_gl_entry in case of cwip enable after puchasing

* fix: invalid variable assignment

* fix: make gl entries if cwip has been booked even if cwip is disabled
* add tests

* fix: conditions

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 16:12:10 +05:30
Saqib Ansari
c3a9513978 fix: test 2020-05-04 20:24:30 +05:30
Deepesh Garg
a4a019f9d9 Merge pull request #21584 from frappe/sahil28297-patch-3 
fix(patch): Reload GSTR 3B report
 2020-05-04 19:26:46 +05:30
sahil28297
67ed21d443 fix(patch): Reload GSTR 3B report 2020-05-04 19:23:26 +05:30
rohitwaghchaure
c89d750e5c fix: heatmap not working for customer and supplier (#21579) 2020-05-04 18:53:26 +05:30
mergify[bot]
c253f0621d fix: fieldname update for 'Credit' and 'Debit' (#21405) (#21577) 
* fix: fieldname update for 'Credit' and 'Debit'

'credit' updated to 'credit_in_account_currency'
'debit' updated to 'debit_in_account_currency'

* Update journal_entry.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit f7a0b8b5b6)

Co-authored-by: Andy Zhu <andy007yan@gmail.com>
 2020-05-04 12:40:39 +05:30
Deepesh Garg
3202b0a486 fix: Accounting Dimensions in Period Closing Voucher (#21565) 2020-05-04 11:12:19 +05:30
Rucha Mahabal
4a37ee8908 fix(Healthcare): remove hardcoded UOM during Item creation for templates (#21575) 2020-05-04 11:09:19 +05:30
Rucha Mahabal
bdbfd2ad0c fix: handle exception if sending Appointment Confirmation message fails (#21568) 2020-05-04 11:07:10 +05:30
Deepesh Garg
933d1262f2 Merge pull request #21376 from marination/commonify-warehouse-autofill-hotfix 
chore: Commonify autofilling warehouses in child tables
 2020-05-03 20:34:20 +05:30
rohitwaghchaure
c4752e36eb Merge pull request #21517 from marination/stock-balance-cleanup-hotfix 
chore: Added company filter and minor cleanup in Stock Balance Report
 2020-05-03 16:31:58 +05:30
Saqib Ansari
0da919c091 fix: test 2020-05-03 14:53:40 +05:30
Saqib
12b5d72e70 chore: add validation for gross purchase amount (#21535) 
* chore: add validation for gross purchase amount

* fix: tests
 2020-05-03 13:20:30 +05:30
Saqib Ansari
272d2bc0b3 fix: review fixes 2020-05-02 19:51:09 +05:30
Saqib Ansari
55b7904e2f fix: incorrect total in sales analytics for customer/item group 2020-05-02 19:39:42 +05:30
Marica
ed709b36b4 fix: variable referenced before assignment (#21561) 2020-05-02 17:55:47 +05:30
Saqib
bf1fc47564 fix: accounts payable shows advance amount of other company (#21549) 2020-05-01 18:15:20 +05:30
Deepesh Garg
db6953dc78 fix: Party Type filter in payment entry list view (#21542) 2020-05-01 15:01:04 +05:30
rohitwaghchaure
438e0f5d49 fix: 'NoneType' object is not iterable (#21538) 2020-05-01 10:50:02 +05:30
rohitwaghchaure
5a9476e0d4 Merge pull request #21502 from nextchamp-saqib/validate-paid-inv-msg-v12 
chore: validate and warn payment against paid invoices
 2020-05-01 10:37:32 +05:30
marination
f77a735469 fix: Make Company the first filter 2020-05-01 00:04:49 +05:30
Saqib Ansari
4451b7eda9 chore: calculate total row month-wise in sales analytics 2020-04-30 20:07:12 +05:30
mergify[bot]
426f0bc168 fix: only check for payment_account on bank entry (#21445) (#21518) 
* fix: only check for payment_account on bank entry

Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission.

* fix: cur_frm to frm

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 95b186268c)

Co-authored-by: Michelle Alva <50285544+michellealva@users.noreply.github.com>
 2020-04-30 19:53:59 +05:30
Saqib
a8b87ccce0 chore: asset accounts should have company currency (#21525) 2020-04-30 18:39:16 +05:30
Saqib Ansari
c31fc19f08 chore: add total row in sales analytics report 2020-04-30 16:29:21 +05:30
marination
5e817b2aee chore: Added company filter and minor cleanup in Stock Balance Report 2020-04-30 14:05:24 +05:30
Saqib Ansari
393857d7de chore: handle credit note validation 2020-04-30 13:24:51 +05:30
Saqib
0ffff47b64 feat: force cost center renaming from cost center form (#21504) 2020-04-30 11:29:03 +05:30
Saqib
6397590f07 fix: list index out of range error (#21468) 
* fix: list index out of range error

* fix: condition
 2020-04-30 11:04:51 +05:30
Nabin Hait
2620ac31f9 fix: Desk links for Income Tax Slab and Employee Other Income (#21511) 2020-04-30 11:03:57 +05:30
Nabin Hait
22c4f82fc6 fix: Tax calcualtion based on slab (#21497) 2020-04-30 11:03:01 +05:30
Nabin Hait
ae5414fced fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21475) 2020-04-30 11:02:45 +05:30
Saqib
61584c8601 fix: print heading field shown in gst section for india region (#21500) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-30 10:58:01 +05:30
rohitwaghchaure
99dfe6c571 Merge pull request #21469 from Alchez/v12-update-lead-contact 
fix: update lead if contact details are changed (v12)
 2020-04-29 22:14:24 +05:30
Saqib Ansari
fd1ab37bc8 chore: validate and warn payment against paid invoices 2020-04-29 15:20:05 +05:30
Rohan Bansal
bd969477b1 fix: AttributeError 2020-04-29 13:09:16 +05:30
Deepesh Garg
a816788039 Merge pull request #21494 from deepeshgarg007/item_wise_sale_purchase_v12 
fix: Group by filter fix in item wise sales and purchase register
 2020-04-29 12:36:22 +05:30
Deepesh Garg
c099a410c8 fix: Group by filter fix in item wise sales and purchase register 2020-04-29 12:21:52 +05:30
Anurag Mishra
e33c44ae33 fix: Permission issue Employee Tax exemption (#21492) 2020-04-29 12:13:26 +05:30
Marica
4930233bbe Merge branch 'version-12-hotfix' into commonify-warehouse-autofill-hotfix 2020-04-29 11:36:48 +05:30
Deepesh Garg
e383727394 Merge pull request #21487 from rohitwaghchaure/not-able-to-make-payment-request-against-fees-hotfix 
fix: payment request not able to make against fees
 2020-04-29 09:36:55 +05:30