Commit Graph

30985 Commits

Author SHA1 Message Date
Marica
9039e29a8c Merge branch 'version-12-hotfix' into fixed-incorrect-operation-time-calculation 2020-10-08 14:06:13 +05:30
Saqib
7c760f62c3 fix: 'stock_rbnb_currency' referenced before assignment (#23528) 2020-10-08 13:49:07 +05:30
rohitwaghchaure
f64adc8acf Merge pull request #23547 from frappe/account_settings_v12
fix: Typo in Accounts Settings
2020-10-08 11:25:32 +05:30
rohitwaghchaure
5da98cce86 Update test_work_order.py 2020-10-08 11:19:41 +05:30
michellealva
5f3e5c8a7c fix: Typo in Accounts Settings 2020-10-08 09:41:44 +05:30
Tunde Akinyanmi
78a98030ef fix: pass self.flags.ignore_permissions to the ignore_permissions
argument of Address and Contact controller
2020-10-08 02:19:02 +01:00
rohitwaghchaure
41b88eafe0 Merge pull request #23536 from rohitwaghchaure/fixed-cogs-error-in-pr
fix: COGS validation in the purchase receipt
2020-10-07 19:08:49 +05:30
Rohit Waghchaure
3f505b711d fixed: COGS validation in the purchase receipt 2020-10-07 19:06:15 +05:30
Raffael Meyer
65ff74778d Merge branch 'version-12-hotfix' into v12-hotfix-get_pricing_rule 2020-10-07 09:47:53 +02:00
Deepesh Garg
81b47821b7 Merge pull request #23354 from deepeshgarg007/tax_fetch_quote_v12
fix: Taxes not getting fetched from Opportunity to Quotation
2020-10-06 19:55:38 +05:30
Raffael Meyer
b2d1ae2cb8 Merge branch 'version-12-hotfix' into fix_fiscal_year 2020-10-06 10:56:13 +02:00
Rohit Waghchaure
f0108b42fd refactor: added new filters in the Batch-wise balance history report 2020-10-06 13:47:03 +05:30
Rohit Waghchaure
20262e00df feat: balance serial nos in stock leder report 2020-10-06 12:50:21 +05:30
rohitwaghchaure
448af6a893 Merge pull request #23484 from marination/item-attr-fix
fix: Handle Blank from/to range in Numeric Item Attribute
2020-10-06 12:00:36 +05:30
Rohit Waghchaure
1c826afa01 fix: incorrect operation time calculation for batch size 2020-10-05 16:57:21 +05:30
Deepesh Garg
ad4b421251 Merge pull request #23463 from rohitwaghchaure/skip-non-apply-tds-invoices
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-10-05 14:21:48 +05:30
rohitwaghchaure
748585c9a9 Merge pull request #23512 from marination/sales-order-project-fix
fix: Show Project under Create button in SO
2020-10-05 13:17:57 +05:30
marination
6e1d818c3e fix: Show Project under Create button in SO 2020-10-05 12:36:55 +05:30
Faris Ansari
a246b1db20 Merge pull request #23508 from rohitwaghchaure/item-configure-performace-issue
fix: performance issue while adding template item in the cart
2020-10-05 11:45:49 +05:30
Rohit Waghchaure
5056fbcb9d fix: performance issue while adding template item in the cart 2020-10-04 20:14:53 +05:30
Saqib
8aad02f822 fix: naming series - cannot reset current value to zero (#23505) 2020-10-04 18:13:58 +05:30
barredterra
e1f1d5a67d fix: fiscal year can be shorter than 12 months 2020-10-03 18:28:43 +02:00
barredterra
b4c2816343 fix: check fiscal year 2020-10-03 17:25:26 +02:00
Rohit Waghchaure
feade95a26 fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled 2020-10-03 16:16:24 +05:30
marination
fe0ce60d75 fix: Handle Blank from/to range in Numeric Item Attribute 2020-10-02 12:28:41 +05:30
rohitwaghchaure
58598c6070 Merge pull request #23433 from rohitwaghchaure/fixed-stock-ageing-report-data
fix: stock ageing report
2020-09-30 23:37:40 +05:30
Deepesh Garg
e4df9dde6b Merge pull request #23442 from prssanna/company-replace-abbr
fix: longer timeout for company replace abbreviation
2020-09-30 14:07:05 +05:30
Deepesh Garg
b217075f6b fix: Remove any taxes fetched due to unknown rules 2020-09-30 13:00:18 +05:30
Marica
3d254a3fe5 Merge pull request #23458 from marination/update-items-perm-fix
fix: Check only Read and Write Permission in Update Items
2020-09-30 12:55:18 +05:30
Marica
95e50b3f21 Merge branch 'version-12-hotfix' into update-items-perm-fix 2020-09-30 12:29:06 +05:30
Deepesh Garg
80379ef921 fix: Remove any taxes fetched due to unknown rules 2020-09-30 10:28:38 +05:30
Deepesh Garg
b6ce2de666 Merge pull request #23460 from marination/cost-center-validation
fix: Avoid validation of group cost center on repost
2020-09-29 20:26:51 +05:30
marination
91e552ef3a fix: Only validate group cost center if not from repost 2020-09-29 19:33:00 +05:30
Deepesh Garg
096da540e3 fix: Add test 2020-09-29 19:06:21 +05:30
Deepesh Garg
54c993fb75 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into tax_fetch_quote_v12 2020-09-29 18:47:01 +05:30
marination
3fdabe75d3 fix: Check only Read and Write Permission in Update Items 2020-09-29 18:26:40 +05:30
rohitwaghchaure
103866a367 Merge pull request #23451 from rohitwaghchaure/display-item-name-instead-of-code
fix: display item name instead of item code in offline POS
2020-09-29 13:01:37 +05:30
Rohit Waghchaure
8ba98a52a0 fix: display item name instead of item code in POS 2020-09-29 13:00:00 +05:30
rohitwaghchaure
c7ef8000ac Update stock_ageing.py 2020-09-28 16:00:48 +05:30
prssanna
031502e64c fix: longer timeout for company replace abbreviation 2020-09-28 13:34:24 +05:30
Oliver Liu
572ee8b152 include item_code in query result 2020-09-28 02:24:31 +02:00
Rohit Waghchaure
560f513d69 fix: stock ageing report 2020-09-25 01:12:31 +05:30
rohitwaghchaure
968cb60010 Merge pull request #23430 from prssanna/mr-stock-uom
fix: set stock UOM in item while creating material request from stock entry
2020-09-24 20:05:20 +05:30
prssanna
92c1f38c33 fix: set stock uom in tem while creating material request from stock entry 2020-09-24 17:08:22 +05:30
Anurag Mishra
1caab44c29 fix:dash board for pre-release test (#23426) 2020-09-24 15:43:18 +05:30
Saqib
b61361f942 chore: make asset movement transaction date match with purchase date & time (#23424) 2020-09-24 15:08:52 +05:30
Marica
abd4b04cd9 fix: Check Company in Payment Entry before selecting values (#23420) 2020-09-24 12:07:43 +05:30
rohitwaghchaure
8699e82290 Merge pull request #23411 from anupamvs/leave-application-status-v12-hotfix
fix: leave application status fix
2020-09-23 20:28:40 +05:30
rohitwaghchaure
5100410e10 Merge pull request #23412 from rohitwaghchaure/book-loss-amount-in-cogs
refactor: book loss amount in the COGS instead of stock received but not billed
2020-09-23 20:28:21 +05:30
Rohit Waghchaure
9e3764ab62 refactor: book loss amount in the COGS instead of stock received but not billed 2020-09-23 19:35:49 +05:30