Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,345 Commits 3 Branches 0 Tags 1 GiB
d272fd42c9
Commit Graph

28345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Karthikeyan S
747c2624cd
fix(BOM): Sever Error due in bom query to new behaviour of db.escape in v12 (#18401) 
fixes bug introduced by commit 6a7969117f
 2019-07-19 22:49:21 +05:30
Rucha Mahabal
a566b4e24a
Merge branch 'develop' into email-campaign 2019-07-19 15:07:56 +05:30
Himanshu
0a8816e053 feat(Google Maps): Google Maps Refactor [Unified Google API Settings] (#18110) 2019-07-19 14:38:04 +05:30
Deepesh Garg
fefe4ac095
Merge pull request #18381 from surajshetty3416/fix-payroll-UI 
fix: Show submit after salary slip creation
 2019-07-19 12:09:21 +05:30
Deepesh Garg
b7fc8fded8
Merge pull request #18397 from surajshetty3416/employee-skill-map-config 
fix: Add Employee Skill Map to HR module page
 2019-07-19 12:07:39 +05:30
rohitwaghchaure
65f01dddc0
Merge pull request #18415 from frappe/Salmanmulani-patch-1 
fix: added default value for projected_qty in bin_dict
 2019-07-19 11:52:57 +05:30
Salmanmulani
b752acf803
fix: added default value for projected_qty in bin_dict 
`projected_qty` if not in `bin_dict` would return None. And when compared to an integer would result in a TypeError.

This PR fixes this

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
 2019-07-19 11:44:49 +05:30
Suraj Shetty
d33c2337cf
Merge branch 'develop' into employee-skill-map-config 2019-07-19 10:45:03 +05:30
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
e0d8cf1851 fix: Add Employee Skill Map to HR module page 2019-07-18 15:58:50 +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
4bf65dd0d9
Merge branch 'develop' into develop-customer-item-price-report 2019-07-18 10:15:20 +05:30
Suraj Shetty
4302c4aa4e
Merge branch 'develop' into fix-payroll-UI 2019-07-18 08:50:16 +05:30
Govind S Menokee
ce42c53c1c
Merge branch 'develop' into batch_bom_operations 2019-07-17 22:40:02 +05:30
Govind S Menokee
51b7b6f5d0 feat: remove explicit commit call 2019-07-17 22:38:30 +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
rohitwaghchaure
c0731f6fd7
Merge pull request #18387 from rohitwaghchaure/cost_center_not_able_to_access_develop 
fix: cost center not able to access
 2019-07-17 21:37:16 +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
Suraj Shetty
06b56adc71
Merge branch 'develop' into develop-customer-item-price-report 2019-07-17 17:29:42 +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
Suraj Shetty
9eb091162a
Merge branch 'develop' into refactor-call-popup 2019-07-17 13:23:54 +05:30
Suraj Shetty
82cfccab2f fix: Get user_id of employee instead of name 
- Remove caching from lead
 2019-07-17 11:52:35 +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
deepeshgarg007
4a7f370b15 fix: Consider serial no and batches in Stock ageing report 2019-07-16 16:08:50 +05:30
Faris Ansari
a4e0532df0 fix: Project Template should be set only once (#18354) 2019-07-16 15:59:37 +05:30
Suraj Shetty
2295921821
Merge branch 'develop' into refactor-call-popup 2019-07-16 13:54:07 +05:30
Suraj Shetty
e7d277d51e fix: Last communication query 2019-07-16 13:53:41 +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
rohitwaghchaure
e3a1718f42
Merge pull request #18355 from Mangesh-Khairnar/fix-get-outstanding-invoices 
fix(payment-entry): remove unused argument
 2019-07-16 12:33:06 +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
Suraj Shetty
f5dd494716 fix(call popup): Multiple changes 
- Remove summary from call log use comments instead
- Add contact and lead if matched to the call log
- Add received by field with Employee Link
- DocPerm to allow Employees to have read access on call log
- Remove unwanted code
- Add a method to get lead just by providing phone number
- Show popup only to Employee to which the system is trying to connect.
- Remove custom code from call popup dialog and replace it with
 standard fields
- Increase timeout to hide popup after the call has been disconnected.
 2019-07-16 11:07:25 +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