Commit Graph

31083 Commits

Author SHA1 Message Date
Deepesh Garg
8705df6283 fix: Remove duplicate code from accounting dimension 2020-04-28 20:19:26 +05:30
marination
b7f6878222 fix: Handle empty child table 2020-04-28 19:18:45 +05:30
Shivam Mishra
525138c42a
Merge branch 'develop' into razorpay-subscription 2020-04-28 19:06:02 +05:30
Rohan Bansal
76825ab2bd fix: update lead if contact details are changed 2020-04-28 16:13:53 +05:30
Shivam Mishra
d445ffc458 feat: whitelist api 2020-04-28 16:04:31 +05:30
Shivam Mishra
7b836e9a92 refactor: update susbcription values all the time 2020-04-28 15:43:04 +05:30
Deepesh Garg
dcef7a96ef
Merge pull request #21463 from deepeshgarg007/allow_loan_security_rename
fix: Allow rename for Loan Security
2020-04-28 14:31:56 +05:30
Deepesh Garg
7b14721e2f fix: Allow rename for Loan Security 2020-04-28 14:25:36 +05:30
Deepesh Garg
428978762b
Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:12 +05:30
Nabin Hait
1bd6de41e6
Merge branch 'develop' into refactor-addiional-salary 2020-04-28 13:15:18 +05:30
Deepesh Garg
fa2eecc5fc fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:12:22 +05:30
rohitwaghchaure
28a4880b48
fix: added validation to not allow to select expired batch (#21455) 2020-04-28 13:01:43 +05:30
Marica
299e217668
fix: Blanket Order in SO/PO child tables (#21442) 2020-04-28 13:00:04 +05:30
rohitwaghchaure
daf37e7570
fix: better validation message for the expense claim and set default cost center in the expenses table (#21454) 2020-04-28 12:48:22 +05:30
Deepesh Garg
558f6aa4cb
Merge pull request #21456 from deepeshgarg007/gross_profit_width
fix: Default column width in Gross profit report
2020-04-28 12:35:50 +05:30
Anoop
b5e7ea7ab8
Merge branch 'develop' into multi_company 2020-04-28 11:38:07 +05:30
Deepesh Garg
142af4b58a fix: Default column width in Gross profit report 2020-04-28 11:17:45 +05:30
Nabin Hait
504a5f3a3a
fix: reload income_tax_slab_other_charges in patch (#21447)
* fix: reload income_tax_slab_other_charges in patch

* fix: reload lower_deduction_certificate in patch
2020-04-28 11:16:04 +05:30
rohitwaghchaure
236c28fc91
Merge pull request #21453 from anupamvs/campaign-card
Added Campaign Card in CRM Desk
2020-04-28 03:04:12 +05:30
Anupam K
01d0b373e0 Review changes 2020-04-28 00:21:10 +05:30
anoop
1696a2a4b9 fix: default sms text in settings - corrected field names 2020-04-27 23:44:41 +05:30
anoop
0f541cb7ab feat: set title for appointment, encounter, procedure and vitals 2020-04-27 23:42:22 +05:30
Anupam K
cc9dbb912e Adding campaign card in CRM Desk 2020-04-27 22:37:02 +05:30
anoop
ca6f3ec977 fix: set customer name on patient update 2020-04-27 22:27:13 +05:30
anoop
256b77b463 fix: filter service unit by company 2020-04-27 20:00:27 +05:30
anoop
e30cc83591 fix: field order, minor fixes -
patient - update customer, releated fields
patient appointment - send message
2020-04-27 19:36:49 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53 fix: Test 2020-04-27 14:05:45 +05:30
rohitwaghchaure
cf86921edd
Merge pull request #21439 from ruchamahabal/fix-delivery-trip
fix: Delivery Trip Form not Loading
2020-04-27 12:33:23 +05:30
Wolfram Schmidt
acfe8f020f
added time stamp to commit
added time stamp to commit
2020-04-27 08:48:34 +02:00
Rucha Mahabal
f40a431d8c fix: delivery trip form 2020-04-27 11:29:56 +05:30
Ahmad
f34faa9181
Module Import Fix (#21433) 2020-04-27 10:57:02 +05:30
Rucha Mahabal
131452ca94
fix: Lab Test Invoicing (#21435) 2020-04-27 10:52:38 +05:30
Rucha Mahabal
7bbe3dd8a0
fix: Patch for updating Appointment Reminder method in Scheduled Job Type (#21431) 2020-04-27 10:51:46 +05:30
Deepesh Garg
4eecc65cff fix: E-way bill fix in Delivery Note 2020-04-27 10:50:59 +05:30
Deepesh Garg
00ea59b447 fix: Utils messsage cleanup 2020-04-27 10:50:40 +05:30
Deepesh Garg
10aff8e118 fix: E-way bill fix in List view 2020-04-27 10:50:17 +05:30
Deepesh Garg
9979ceb96b fix: E-way bill fix in sales invoice 2020-04-27 10:50:03 +05:30
Deepesh Garg
24b6055d89
Merge pull request #21427 from ruchamahabal/fix-desk-pages
fix(Desk Page): Number of Open Leads not visible on Shortcut Card
2020-04-27 08:41:14 +05:30
rohitwaghchaure
4b2d9b3679
Merge pull request #21386 from nextchamp-saqib/quo-status-fix
fix: quotation have expired status even if sales order exists
2020-04-27 05:18:35 +05:30
rohitwaghchaure
4d754eadc8
Merge branch 'develop' into quo-status-fix 2020-04-27 00:22:43 +05:30
Rucha Mahabal
e34ec70d44 fix(Desk Page): Number of Open Leads not visible on Shortcut Card 2020-04-26 23:40:37 +05:30
Nabin Hait
2305d00e0b
fix: Procurement tracker report (#21421)
* fix: procurement report data was not coming

* fix: leave allocation minor issue
2020-04-26 23:29:13 +05:30
Himanshu
c9a1aa8eaa
fix: add dashboard to quality inspection template (#21423) 2020-04-26 23:28:33 +05:30
Suraj Shetty
3e3a793567
fix: Set barcode field empty only if it has value (#21425)
- To avoid unnecessary form dirty trigger
2020-04-26 23:25:40 +05:30
Anurag Mishra
ded418e31d
feat: employee leave balance reports (#20754)
* feat: Employee leave balance summary report new design

* feat: Employee leave balance report new design

* fix: leave based on multiple holiday list

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 21:04:58 +05:30
Nabin Hait
ba70e7e8bc
Payroll based on attendance (#21258)
* feat: Payroll based on attendance and leave

* test: salary slip based 0n attendance

* feat: Payroll based on attendance

* fix: Codacy issues

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 20:17:48 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870)
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup (#20932)
* chore: Purchase Order Form Cleanup

* fix: Get Items from popups cleanup

* fix: Shift Set Target Warehouse next to Supply Raw Materials.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 20:07:22 +05:30
rohitwaghchaure
733b47c5e6
Merge pull request #21389 from marination/stock-entry-qty
fix: Issues on qty trigger in Stock Entry Detail
2020-04-26 17:59:45 +05:30