CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 14:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,505 Commits 411 Branches 1,717 Tags
2518a2ab169948cff56bfbbedbf7198327b33f25
Commit Graph

25505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
karthikeyan5
2518a2ab16 fix(woocommerce integration): travis fix 2019-04-12 19:35:07 +05:30
karthikeyan5
df3e8853ae fix(woocommerce integration): fix strange travis error 
the patch was working locally. But, in was failing on travis. The strange thing was that the patch running in travis was looking for woocommerce_settings in the path 'frappe.core.doctype.woocommerce_settings.woocommerce_settings'
 2019-04-12 19:35:07 +05:30
karthikeyan5
a0b7ff60b8 fix(woocommerce integration): possible travis fix 
possible fix for travis patch error "Error: No module named woocommerce_settings.woocommerce_settings)"
 2019-04-12 19:35:07 +05:30
karthikeyan5
97383716e6 fix(woocommerce integration): error in new-site 
resolving "Could not find UOM: Nos" error in travis
 2019-04-12 19:35:06 +05:30
karthikeyan5
f788117b3e fix(woocommerce integration): defaults in settings 2019-04-12 19:35:06 +05:30
karthikeyan5
6784335e2c fix(woocommerce integration): fixing 403 error 2019-04-12 19:35:06 +05:30
Nabin Hait
5157fa9233 Merge pull request #17150 from nabinhait/ar-credit-note 
fix: Show standalone credit note in Accounts receivable report
 2019-04-12 14:18:17 +05:30
Nabin Hait
c768febac6 Merge pull request #17206 from rohitwaghchaure/fix_pending_so_items_for_purchase_reques_report 
fix: Pending SO Items For Purchase Request report not showing the so, requested and pending quantity correctly
 2019-04-12 11:11:16 +05:30
Nabin Hait
0449d30423 Merge pull request #16976 from ESS-LLP/patient_hotfix 
fix: Patient relation - patient link is not showing
 2019-04-12 11:08:24 +05:30
Nabin Hait
f17dfb0ebe Merge pull request #17157 from Anurag810/vedmata-print-fixes 
fix: Vedmata print fixes
 2019-04-12 11:07:24 +05:30
Nabin Hait
13273412d1 Merge pull request #17207 from Anurag810/timesheet_report_amount_fixes 
fix: timesheet report not showing total amount correctly
 2019-04-12 11:05:12 +05:30
Nabin Hait
f198b1d032 Merge branch 'hotfix' into timesheet_report_amount_fixes 2019-04-12 11:05:03 +05:30
Nabin Hait
9512a43d44 Merge pull request #17187 from nabinhait/rounding-adjustment-gle 
fix: Rounding Adjustment GL Entry
 2019-04-12 11:00:29 +05:30
Anurag Mishra
50db128ff1 fix: timesheet report not showing total amount correctly 2019-04-11 16:07:38 +05:30
Rohit Waghchaure
5eaf7d0517 fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items 2019-04-11 13:56:40 +05:30
Nabin Hait
4c331206f1 Merge branch 'hotfix' into patient_hotfix 2019-04-11 11:46:53 +05:30
Nabin Hait
bd7a165318 Merge branch 'hotfix' into ar-credit-note 2019-04-11 11:46:16 +05:30
Nabin Hait
aace25ac2b Merge branch 'hotfix' into vedmata-print-fixes 2019-04-11 11:46:00 +05:30
Nabin Hait
c151b58acd Merge branch 'hotfix' into rounding-adjustment-gle 2019-04-11 11:45:36 +05:30
Nabin Hait
0f62b13dd8 Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items 
fix: sales return not working for product bundle items
 2019-04-11 11:44:57 +05:30
Nabin Hait
961d7ace4a Merge pull request #17189 from nabinhait/sales-person 
fix: Made employee optional in sales person
 2019-04-11 11:37:08 +05:30
Nabin Hait
38351587fc Merge pull request #17197 from nabinhait/training-feedback 
fix: training feedback code cleanup
 2019-04-11 11:36:50 +05:30
rohitwaghchaure
4898d1936b Merge pull request #17200 from Anurag810/pos_running 
fix: order by idx(v11)
 2019-04-11 10:57:05 +05:30
rohitwaghchaure
22d6eb3eaa Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix 
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
 2019-04-11 09:58:02 +05:30
rohitwaghchaure
6cd114b467 Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice 
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
 2019-04-11 09:57:45 +05:30
rohitwaghchaure
2521b1347b Merge pull request #17201 from rohitwaghchaure/fix_test_cases_for_item_variant 
Fix: item variant test cases
 2019-04-10 19:16:51 +05:30
Rohit Waghchaure
f3a9552e48 fix: item variant test cases 2019-04-10 17:57:09 +05:30
Anurag Mishra
5ab5f77fd4 fix: order by idx 2019-04-10 17:53:45 +05:30
Rohit Waghchaure
49907e746b fix: test cases 2019-04-10 17:33:32 +05:30
Rohit Waghchaure
45d0b31d44 fix: test cases 2019-04-10 17:25:08 +05:30
Rohit Waghchaure
b286fc99b8 fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled 2019-04-10 16:16:30 +05:30
Nabin Hait
c8c678f747 fix: training feedback code cleanup 2019-04-10 15:56:16 +05:30
Rohit Waghchaure
bb0d4e37b9 fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method 2019-04-10 03:14:11 +05:30
Nabin Hait
b305f38869 fix: Made employee optional in sales person 2019-04-09 20:06:11 +05:30
Nabin Hait
ff73090ad2 fix: Rounding Adjustment GL Entry 2019-04-09 19:24:54 +05:30
Nabin Hait
7dcdb93596 Merge pull request #17178 from Anurag810/timesheet_report_fixes 
fix: timesheet_report (WN-SUP41913)
 2019-04-09 17:28:22 +05:30
Anurag Mishra
22867f7fa5 fix: added currency 2019-04-09 15:06:49 +05:30
Anurag Mishra
3e8b8a4359 fix: filters and some conditions 2019-04-09 14:34:56 +05:30
Anurag Mishra
17fbafa390 fix: filters,added total,only submitted doc,considered fraction 2019-04-09 11:31:11 +05:30
Faris Ansari
aac7719dd9 fix: Translated string method in Jinja (#17174) 2019-04-08 21:50:58 +05:30
Rushabh Mehta
2cce72412d Merge pull request #17168 from frappe/revert-17086-check-version-hf 
Revert "fix: Raise exception if apps are on incompatible branches"
 2019-04-08 17:11:15 +05:30
Rushabh Mehta
1412a681f3 Revert "fix: Raise exception if apps are on incompatible branches" 2019-04-08 17:10:56 +05:30
Saurabh
b0c939d280 Merge branch 'hotfix' v11.1.20 2019-04-08 15:09:04 +05:30
Saurabh
00a5e7a1d0 bumped to version 11.1.20 2019-04-08 15:39:03 +06:00
Nabin Hait
f1698bb2df fix: unique variant based on 2019-04-08 14:59:43 +05:30
Anurag Mishra
4ac386d0fe fix: Removed Extra page on generating pdf in print formats 2019-04-08 11:43:24 +05:30
Anurag Mishra
4753bd4519 fix: UI on generating pdf in print format 2019-04-08 10:53:19 +05:30
Nabin Hait
79c9d5d24a Merge pull request #17146 from Anurag810/timesheet-report 
feat: Timesheet report
 2019-04-08 10:33:44 +05:30
Rohit Waghchaure
3771db92b8 fix: sales return not working for bundle items 2019-04-06 17:34:40 +05:30
Anurag Mishra
76815cf2be fix: removed before from accounts_controlle.pyr and fetch the gl from frontend 2019-04-06 12:07:40 +05:30