Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,639 Commits 3 Branches 0 Tags 1 GiB
6cf018c762
Commit Graph

33639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pateljannat
6cf018c762 fix: holiday update in tests 2020-12-22 19:40:41 +05:30
pateljannat
4ebee5014e feat: aholiday check before setting start and end date in task 2020-12-22 18:14:46 +05:30
pateljannat
3a26f26671 fix: get_doc to avoid modified error 2020-12-22 11:56:59 +05:30
pateljannat
9466e42e70 fix: change request modifications 2020-12-21 20:52:20 +05:30
pateljannat
b8e656512e fix: test cleanup 2020-12-17 20:22:06 +05:30
pateljannat
79b71462cb fix: patch 2020-12-17 18:21:34 +05:30
pateljannat
09f0e9111d fix: patch 2020-12-17 17:20:21 +05:30
pateljannat
2dbb1d6bc7 fix: indentation 2020-12-17 15:49:52 +05:30
pateljannat
2f4c88b228 Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks 2020-12-17 11:56:06 +05:30
pateljannat
f2bff8e220 fix: patch relaod doctype 2020-12-17 11:54:59 +05:30
Jannat Patel
28098d6f93
Merge branch 'develop' into project-template-and-tasks 2020-12-16 20:09:27 +05:30
Rucha Mahabal
21168eab7f
fix: Remove patch for setting next date in Subscription (#24158) 2020-12-16 19:39:34 +05:30
pateljannat
2528d5ee15 fix: tests 2020-12-16 18:29:49 +05:30
Rucha Mahabal
23d6afe43a
fix: Auto Repeat Import (#24157) 2020-12-16 18:21:08 +05:30
Prssanna Desai
df2067003e
Merge pull request #24154 from prssanna/job-card-gantt-v13 2020-12-16 17:01:43 +05:30
Prssanna Desai
421bfee874
Merge branch 'develop' into job-card-gantt-v13 2020-12-16 16:59:50 +05:30
prssanna
ff59f18012 fix: override field_map for job card gantt 2020-12-16 16:56:30 +05:30
pateljannat
d44f45c57b fix: sider issues 2020-12-16 16:28:09 +05:30
Rucha Mahabal
b184d43e75
refactor: Auto Repeat next schedule date function params (#23959) 
* refactor: Auto Repeat next schedule date function params

* refactor: Auto Repeat next schedule date function params
 2020-12-16 14:51:42 +05:30
pateljannat
87b477a311 feat: patch for project template tasks 2020-12-16 13:37:21 +05:30
Deepesh Garg
bc462fa140
Merge pull request #24146 from deepeshgarg007/tax_template_update_customer 
fix: Tax template update on customer address change
 2020-12-16 13:02:00 +05:30
Deepesh Garg
96a5e4effa fix: Tax template update on customer address change 2020-12-16 13:00:55 +05:30
Leela vadlamudi
29778e2fba
feat: Voice Call Settings doctype added (#24126) 2020-12-15 21:23:17 +05:30
Mohammad Hasnain Mohsin Rajan
c553453825
fix: user is not a field (#24129) 2020-12-15 16:29:10 +05:30
pateljannat
a6fef7ae6b feat: parent-child relation tasks 2020-12-15 11:50:18 +05:30
pateljannat
caf67e608f fix: tests 2020-12-15 10:00:31 +05:30
pateljannat
23f0debf88 fix: tests 2020-12-15 10:00:21 +05:30
Raffael Meyer
f2206c27e7
fix: allow other github links in same PR (#23995) 2020-12-15 09:35:16 +05:30
Rucha Mahabal
85213fa8cb
fix(Asset): set current asset value before calculating difference amount (#24119) 2020-12-15 09:32:02 +05:30
Afshan
89d14fdf68
fix: minor ui changes (#24125) 
* fix: minor ui changes

* fix: slider
 2020-12-15 09:31:30 +05:30
Afshan
58e8e06ab7
fix: retention filters (#24123) 
* fix: retention filters

* fix: slider
 2020-12-15 09:17:17 +05:30
Afshan
e64718b2ae
fix: selecting salary component (#24121) 2020-12-15 09:16:27 +05:30
pateljannat
f9751f1f95 feat: project template having dependent tasks 2020-12-14 16:20:02 +05:30
Anurag Mishra
0fc4bb02d1
Merge pull request #24100 from hasnain2808/add-fb-to-je 
fix(asset_val_adj): finance book not getting added in journal Entry of asset value adjustment
 2020-12-14 12:36:03 +05:30
Deepesh Garg
05e8479521
Merge pull request #24117 from deepeshgarg007/gstr_opening_invoices 
fix: Opening invoices in GSTR-1 report
 2020-12-14 11:14:23 +05:30
Mohammad Hasnain Mohsin Rajan
b59d573009
Merge branch 'develop' into add-fb-to-je 2020-12-14 11:13:46 +05:30
Deepesh Garg
c838682188 fix: Opening invoices in GSTR-1 report 2020-12-14 10:35:16 +05:30
rohitwaghchaure
cf5f895617
Merge pull request #24110 from marination/status-updater-same-source-target-tables 
fix: Same source and target tables in Status Updater's update query
 2020-12-13 21:29:19 +05:30
rohitwaghchaure
d06ac9a958
Merge pull request #24114 from rohitwaghchaure/shipping-charges-not-added-in-invoice-develop 
fix: shipping chanrges not sync in erpnext from shopify
 2020-12-13 13:31:39 +05:30
rohitwaghchaure
8b8ef8d364
Merge pull request #24116 from rohitwaghchaure/fixed-stock-entry-multi-consumption-develop 
fix: incorrect stock quantity if 'Allow Multiple Material Consumption…
 2020-12-13 13:31:25 +05:30
rohitwaghchaure
e5e6d8297b
Merge pull request #24115 from rohitwaghchaure/delete-receive-at-warehouse-entry-develop 
fix: delete Receive at Warehouse entry on cancellation of Send to War…
 2020-12-13 12:33:50 +05:30
Deepesh Garg
9779a81a33
Merge pull request #23868 from deepeshgarg007/loan_patch_fix 
fix: Patch for old loans
 2020-12-12 21:45:17 +05:30
Deepesh Garg
ced3b13492 fix: Check for paid field 2020-12-12 19:31:05 +05:30
Deepesh Garg
68fce6d029 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix 2020-12-12 19:28:50 +05:30
Rohit Waghchaure
edb99d4e53 fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled 2020-12-12 16:03:07 +05:30
Rohit Waghchaure
5bfd6831c4 fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry 2020-12-12 16:00:28 +05:30
Rohit Waghchaure
67dfe5db0d fix: shipping chanrges not sync in erpnext from shopify 2020-12-12 15:59:17 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company (#24021) 
* fix: Accounting for internal transfer invoices within same company

* fix: warehouse fetching

* fix: Linting issues

* fix: GL entry fixes and validation for intercompany account

* fix: Account naming changes and other fixes

* fix: Add test for internal transfer

* fix: Test Case

* fix: Add description for fields

* fix: Commonfied code

* fix: Map warehouse and serial no
 2020-12-11 21:30:39 +05:30
Rohit Waghchaure
3eea3c6c95 fix: Table 'tabStock Entry Detail' is specified twice 2020-12-11 18:45:39 +05:30
Mohammad Hasnain Mohsin Rajan
f8d6726990
fix(acc recv report): columns mismatch (#24109) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-12-11 13:28:23 +05:30