deepeshgarg007
|
2e9c2ff545
|
Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest
|
2019-01-11 15:57:48 +05:30 |
|
Fisher Yu
|
2cd49f51e2
|
fix issue #16284, child table copy (#16285)
* fix issue #16284, child table copy
V11 Child table from Clipboard Excel error, can't multiply sequence by non-int of type 'float'
* Update get_item_details.py
consider the empty string case
* Update get_item_details.py
|
2019-01-11 15:31:33 +05:30 |
|
Rushabh Mehta
|
d254af9fea
|
fix(patch): set_backup_limit.py
|
2019-01-11 15:07:26 +05:30 |
|
deepeshgarg007
|
720020319f
|
fix(Codacy): removed unused variable
|
2019-01-09 21:56:45 +05:30 |
|
deepeshgarg007
|
c039f70496
|
Test Cases for
account balance report
|
2019-01-09 21:56:45 +05:30 |
|
deepeshgarg007
|
8621869d24
|
Created multiple reports and linked them to email digest
|
2019-01-09 21:56:45 +05:30 |
|
deepeshgarg007
|
2b47d39274
|
feat: Links for reports in email digest
|
2019-01-09 21:54:40 +05:30 |
|
Saurabh
|
afec3ca89a
|
Merge branch 'staging' into develop
|
2019-01-08 17:09:36 +05:30 |
|
Saurabh
|
1836285c01
|
bumped to version 11.0.3-beta.34
|
2019-01-08 16:52:38 +06:00 |
|
rohitwaghchaure
|
ffdadbf97f
|
fix: fallback to stock uom if uom is not defined (#16329)
* [minor] Code cleanup
* fix: remove 'or' condition, won't execute
|
2019-01-08 16:21:25 +05:30 |
|
Nabin Hait
|
05f86edd11
|
Merge pull request #16310 from deepeshgarg007/opportunity-lost-reason
feat: Opportunity lost reason selection using table multiselect
|
2019-01-08 16:18:07 +05:30 |
|
Nabin Hait
|
c190192d5f
|
Merge pull request #16277 from deepeshgarg007/loyalty-program-fix
fix: Loyalty program issue fix in customer dashboard
|
2019-01-08 12:15:57 +05:30 |
|
Nabin Hait
|
4c08aaef3d
|
Merge pull request #16290 from deepeshgarg007/stock-recon
fix: Unorderable type error while making stock reconciliation entry
|
2019-01-08 11:55:49 +05:30 |
|
Nabin Hait
|
4216d86dd9
|
Merge pull request #16296 from deepeshgarg007/update_items_bug
fix: Validation while updating items in sales order
|
2019-01-08 11:54:52 +05:30 |
|
Nabin Hait
|
9ed6deb452
|
Merge pull request #16333 from deepeshgarg007/report-fix
fix: added customer group column in Item-wise Sales History report
|
2019-01-08 11:53:14 +05:30 |
|
Nabin Hait
|
49ca9dceb2
|
Merge branch 'staging-fixes' into report-fix
|
2019-01-08 11:53:06 +05:30 |
|
Nabin Hait
|
4e3e784691
|
Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix
perf: Customer contact column in accounts receivable report
|
2019-01-08 11:52:20 +05:30 |
|
Deepesh Garg
|
7c45f45ebc
|
fix: Divide by zero exception fix in item wise purchase register (#16247)
* Do not prepare row if stock quantity is not available
* Update item_wise_purchase_register.py
|
2019-01-08 08:34:28 +05:30 |
|
Saif
|
e5091cbc0f
|
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356)
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
|
2019-01-07 18:19:30 +05:30 |
|
Sagar Vora
|
cad20abe83
|
Merge branch 'staging-fixes' into loyalty-program-fix
|
2019-01-07 15:32:40 +05:30 |
|
Sagar Vora
|
a4af874a43
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-07 15:21:02 +05:30 |
|
Sagar Vora
|
f14c56488f
|
Merge pull request #16325 from rohitwaghchaure/not_able_to_access_report_quoted_item_comparison
fix: report quoted item comparison not working
|
2019-01-07 14:55:14 +05:30 |
|
Sagar Vora
|
fd78339a7c
|
Merge branch 'staging-fixes' into not_able_to_access_report_quoted_item_comparison
|
2019-01-07 14:54:44 +05:30 |
|
Sagar Vora
|
db40ea4f76
|
Merge pull request #16328 from rohitwaghchaure/fixed_salary_structure_employee_reqd
fix: employee is reqd to preview salary slip from salary structure
|
2019-01-07 14:30:57 +05:30 |
|
Sagar Vora
|
26e5c9480b
|
Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd
|
2019-01-07 14:30:23 +05:30 |
|
Sagar Vora
|
1310c238a9
|
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger
fix: replaced str to cstr in genral ledger report
|
2019-01-07 14:28:27 +05:30 |
|
Rohit Waghchaure
|
ed6725172d
|
Replaced str to cstr in genral ledger report
|
2019-01-06 20:07:18 +05:30 |
|
Deepesh Garg
|
0eca1646e6
|
Merge branch 'staging-fixes' into loyalty-program-fix
|
2019-01-06 12:16:54 +05:30 |
|
Deepesh Garg
|
4772ae2755
|
Merge branch 'staging-fixes' into stock-recon
|
2019-01-06 12:16:45 +05:30 |
|
Deepesh Garg
|
16745c2553
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-06 12:16:37 +05:30 |
|
Deepesh Garg
|
627b566445
|
Merge branch 'develop' into opportunity-lost-reason
|
2019-01-06 12:16:26 +05:30 |
|
Deepesh Garg
|
b12c7358b1
|
Merge branch 'staging-fixes' into report-fix
|
2019-01-06 12:16:11 +05:30 |
|
Deepesh Garg
|
f840c92c10
|
Merge branch 'staging-fixes' into accounts-receivable-fix
|
2019-01-06 10:35:12 +05:30 |
|
Frappe Bot
|
fdd5d54d41
|
Merge branch 'staging' into develop
|
2019-01-05 09:11:15 +00:00 |
|
Frappe Bot
|
094d539cd9
|
Merge branch 'staging-fixes' into staging
|
2019-01-05 09:11:14 +00:00 |
|
Frappe Bot
|
0d54271d15
|
bumped to version 11.0.3-beta.33
|
2019-01-05 09:11:14 +00:00 |
|
Deepesh Garg
|
1bb9287b2d
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-04 14:15:40 +05:30 |
|
Sagar Vora
|
53cac1b616
|
Merge pull request #16338 from sahil28297/remove_print_from_test_case
fix: Remove print statement from test case
|
2019-01-04 13:31:00 +05:30 |
|
Sahil Khan
|
3ac57c756b
|
fix: remove print statement from test case
|
2019-01-04 12:57:34 +05:30 |
|
deepeshgarg007
|
eabf260706
|
fix :Test cases for accounts receivable report
|
2019-01-04 12:34:28 +05:30 |
|
deepeshgarg007
|
9de81cda77
|
Added Customer contact column in accounts Receivable
|
2019-01-04 10:54:24 +05:30 |
|
deepeshgarg007
|
32f054b901
|
Added customer group column in item-wise-sales-history report
|
2019-01-03 22:57:18 +05:30 |
|
Sagar Vora
|
cda289dc27
|
Merge pull request #16323 from sagarvora/fix_tests
fix: leave application and timesheet tests
|
2019-01-03 16:38:46 +05:30 |
|
Rohit Waghchaure
|
8bac5b6e73
|
[minor] Employee is reqd to preview salary slip from salary structure
|
2019-01-03 16:20:35 +05:30 |
|
Rohit Waghchaure
|
3dc5b93db7
|
[Fix] Report quoted item comparison not working
|
2019-01-03 12:19:44 +05:30 |
|
Sagar Vora
|
c14c7c84e3
|
fix: leave application and timesheet tests
|
2019-01-02 21:28:11 +05:30 |
|
rohitwaghchaure
|
9c69e40970
|
Merge pull request #16312 from rohitwaghchaure/fix_not_able_to_delete_department
[Fix] Not able to delete department
|
2019-01-02 15:58:24 +05:30 |
|
Deepesh Garg
|
74306cc5ea
|
Merge branch 'staging-fixes' into update_items_bug
|
2019-01-02 14:10:23 +05:30 |
|
deepeshgarg007
|
f9f753c95c
|
fix: Added missing semicolon
|
2019-01-02 13:59:42 +05:30 |
|
deepeshgarg007
|
8c4bd951a8
|
fix(Codacy): Deleted unused imports and files
|
2019-01-02 13:24:12 +05:30 |
|