Commit Graph

19191 Commits

Author SHA1 Message Date
Suraj Shetty
fea0fc02cd
Merge branch 'develop' into fix-payroll-UI 2019-07-19 10:44:56 +05:30
Deepesh Garg
635dc1dfda
Merge pull request #18408 from rohitwaghchaure/not_able_to_make_material_request_for_product_bundle_from_so
fix: not able to make material request for bundle items from the sale…
2019-07-19 09:48:07 +05:30
Deepesh Garg
f449f51147
Merge branch 'develop' into fix-payroll-UI 2019-07-19 08:07:35 +05:30
rohitwaghchaure
8fedf53304
Merge pull request #18379 from rohitwaghchaure/pos_fixed_address_and_taxes_and_charges_not_set_as_per_profile
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-19 08:00:33 +05:30
Rohit Waghchaure
9fe6e00a4e fix: not able to make material request for bundle items from the sales order 2019-07-19 07:54:08 +05:30
Suraj Shetty
22ff54b777
Merge branch 'develop' into fix-payroll-UI 2019-07-18 12:50:31 +05:30
Anurag Mishra
0e23307dbf fix: handled value Error (#18361) 2019-07-18 12:43:18 +05:30
Frappe PR Bot
98a9a4865e feat: Updated translation (#18364) 2019-07-18 12:42:31 +05:30
Suraj Shetty
4302c4aa4e
Merge branch 'develop' into fix-payroll-UI 2019-07-18 08:50:16 +05:30
rohitwaghchaure
6349f61882
Merge pull request #18385 from rohitwaghchaure/offline_pos_syncing_issue_for_customer_develop
fix: offline pos syncing issue for customer
2019-07-17 21:37:55 +05:30
Rohit Waghchaure
438efb4008 fix: cost center not able to access 2019-07-17 21:21:58 +05:30
Rohit Waghchaure
0851c94e9b fix: offline pos syncing issue for customer 2019-07-17 20:36:33 +05:30
Suraj Shetty
f9c650f8e6 fix: Show submit after salary slip creation 2019-07-17 19:38:46 +05:30
Rohit Waghchaure
dcf2d3532e fix: address and taxes not set as per pos profile in the pos invoice 2019-07-17 19:28:36 +05:30
rohitwaghchaure
41aee35070
Merge pull request #18369 from Anurag810/fix_precision_v12
fix: precision for base grand total amount
2019-07-17 19:00:43 +05:30
rohitwaghchaure
3403d1cc44
Merge pull request #18095 from scmmishra/remove-move-stock-summary
refactor: move and add for serialized and batch items in stock summary
2019-07-17 18:50:00 +05:30
Anurag Mishra
8a06b8fd38 fix precision 2019-07-17 14:55:16 +05:30
Rucha Mahabal
65a627cb5b fix: module changes for Auto Repeat from Desk to Automation (#18356) 2019-07-17 13:50:32 +05:30
Deepesh Garg
807ef6af41
Merge pull request #18340 from deepeshgarg007/ac_dim_usability_fixes
fix: Usability fixes in Accounting Dimensions
2019-07-16 19:25:54 +05:30
Deepesh Garg
0d7cc663c8
Merge pull request #18348 from rohitwaghchaure/get_items_from_not_pulled_the_description_set_in_bom
fix: description set in the bom not pulled in the material request
2019-07-16 19:23:35 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes 2019-07-16 16:17:07 +05:30
Faris Ansari
a4e0532df0 fix: Project Template should be set only once (#18354) 2019-07-16 15:59:37 +05:30
Shivam Mishra
7339c72208
Update item_dashboard.js 2019-07-16 13:19:13 +05:30
Shivam Mishra
5738c93b8f style: commonified move and add button handler 2019-07-16 12:52:19 +05:30
Shivam Mishra
7ab6010225 Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary 2019-07-16 12:33:13 +05:30
Shivam Mishra
fd6ff62bdb style: code styling fixes 2019-07-16 12:32:50 +05:30
Mangesh-Khairnar
b560050334 fix(payment-entry):remove unused argument 2019-07-16 12:11:44 +05:30
Deepesh Garg
8c21703959 fix: Fixes in get_balance_on function (#18324) 2019-07-16 09:41:01 +05:30
Faris Ansari
82770d9152 fix: Project fixes (#18343)
* fix: Add fetch from in Full Name

* fix: Remove deprecated buttons

* fix: Show Project to Administrator
2019-07-16 09:40:09 +05:30
Deepesh Garg
ce3594796c
Merge pull request #18320 from deepeshgarg007/quo_opp_address_fix_develop
fix: Address fixes in quotation and opportunity
2019-07-16 08:42:18 +05:30
Deepesh Garg
8fcd426dab
Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop
feat: added payment terms filter in the accounts payable summary
2019-07-16 08:39:30 +05:30
deepeshgarg007
af6c09ae09 fix: Codacy 2019-07-16 08:33:13 +05:30
Rohit Waghchaure
4c0dffe687 feat: added payment terms filter in the accounts payable summary 2019-07-16 02:00:41 +05:30
Rohit Waghchaure
c67743b1f8 fix: description set in the bom not pulled in the material request 2019-07-16 01:27:26 +05:30
rohitwaghchaure
e9f0e88f9b fix: taxes sequence if shipping rule is set in the sales invoice (#18329) 2019-07-15 18:57:25 +05:30
Deepesh Garg
322053ee1b
Merge pull request #18136 from nabinhait/inv-disc-improvements
fix: set invoice status considering invoice discounting
2019-07-15 18:53:30 +05:30
deepeshgarg007
84d1e12f34 fix: Typo 2019-07-15 18:42:22 +05:30
deepeshgarg007
8cbc22062b fix: Remove cost center filter from customer credit balance report 2019-07-15 18:35:19 +05:30
deepeshgarg007
ad4c111d91 fix: Remove cost center filter from customer credit balance report 2019-07-15 18:32:10 +05:30
deepeshgarg007
2093ffc15b fix: Usability fixes in accountng dimensions 2019-07-15 18:21:05 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788)
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
2019-07-15 18:02:58 +05:30
sahil28297
39c3cfa25d fix(hr_setting): fix translation method call (#18328) 2019-07-15 11:25:26 +00:00
sahil28297
7697066cc2 fix(sales_order_list): compare type as well (#18331)
* fix(sales_order_list): compare type as well

* fix(sales_order_list): compare type as well
2019-07-15 11:25:06 +00:00
sahil28297
ec810a4a55 fix(product_page): compare type as well and provide base class for parseInt (#18332) 2019-07-15 11:24:41 +00:00
sahil28297
96f33cef49
Merge branch 'develop' into quo_opp_address_fix_develop 2019-07-15 15:42:55 +05:30
deepeshgarg007
1cc46c06b0 Merge branch develop into ac_dim_usability_fixes 2019-07-15 15:34:40 +05:30
Faris Ansari
1abd1e79a9 fix: Module Links (#18318)
* fix: Add Project Billing Summary link

* fix: Bank Guarantee shouldn't depend on Bank Guarantee
2019-07-15 14:34:10 +05:30
Faris Ansari
280fe396b9 fix: Dont rebuild cache on cache bust (#18319)
- Results in a lot of stale background jobs
- Cache will be built when needed
2019-07-15 14:30:21 +05:30
Anurag Mishra
e37ff39836 fix: Validate loan repayment amount in Loan Application (#18169)
* fix: validate loan repayment amount

* fix: test for loan application
2019-07-15 14:16:52 +05:30
Mangesh-Khairnar
1ac9a8e82e fix(bin): update requested qty in bin (#18297) 2019-07-15 14:08:47 +05:30