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

1559 Commits

Author SHA1 Message Date
deepeshgarg007
737ec6b26e fix: Travis 2019-10-20 17:36:36 +05:30
Rohit Waghchaure
66072fec5a fixed conflicts 2019-10-15 14:18:59 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
Mangesh-Khairnar
4ed9b45fb8 feat(Sales Order): Allow to skip delivery note creation (#19222) 
* feat(sales-order): add option to skip delivery note creation for order type maintenance

* fix(sales-order): hide delivery date on setting skip delivery note creation

* fix: allow skipping delivery note for all order types

* fix: bypass delivery note creation on setting skip delivery note creation

* fix: show skip delivery note in list view

* fix: check for duplicate project name after submitting prompt

* fix:  toggle delivery note reqd for skip delivery note

* fix: update status based on skip delivery note
 2019-10-12 19:33:11 +05:30
Himanshu
eba3a8e802 fix: get contact details (#19281) 2019-10-11 10:43:24 +05:30
Saqib
d5067b4d73 chore: label changes in retail and stock (#19243) 2019-10-04 16:24:26 +05:30
Rucha Mahabal
34326470b8 fix: produced_qty field hidden and not updated in sales order item (#19037) 
* fix: produced_qty field hidden and not updated in sales order item

* fix: added patch for old sales orders

* fix: produced_qty for sales order item linked to multiple work orders

* fix: comment

* fix: function for updating produced_qty in SO Item

* fix: remove frappe.db.commit
 2019-09-30 12:15:39 +05:30
Himanshu
25ab1e41df fix(Contact): mobile_no re-introduced and travis fixes (#19009) 
* fix: mobile_no re-introduced

* fix: test cases

* fix: set email as primary

* fix: add primary email and phone

* fix: utils for contact creation

* chore: remove = from dict
 2019-09-30 10:08:15 +05:30
Saqib
451d1a1744 fix: Bypass credit limit and Project Template field not visible(#19162) 
* Fix: Allow Project Template in Quick Entry

* Fix: Label Changes
 2019-09-24 19:10:59 +05:30
Deepesh Garg
d9e9d562f8 fix: Travis (develop) (#19140) 
* fix: Travis

* fix: Syntax Error
 2019-09-24 11:44:52 +05:30
rohitwaghchaure
e18f7b91c3
Merge pull request #19127 from rohitwaghchaure/removed_mandatory_property_for_address_field_in_quick_entry_develop 
fix: removed mandatory property for address field in quick entry
 2019-09-23 14:48:27 +05:30
Rohit Waghchaure
1f9a84f165 fix: removed mandatory property for address field in quick entry 2019-09-20 12:18:23 +05:30
Anurag Mishra
c16fb9eb9d
fix: dashboard button not working (#19094) 2019-09-19 18:12:39 +05:30
Himanshu
d51f7af9ab fix: add contact phone to sales order (#19012) 2019-09-12 19:19:17 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +05:30
Nabin Hait
b847731482 Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit 2019-09-05 16:47:08 +05:30
Anurag Mishra
867ac10ffd fix: handle for product bundle (#18420) 
* fix: handle for product bundle

* fix: Requested changes and some general fixes
 2019-09-05 15:13:21 +05:30
Andy Zhu
91596f2467 Change the field name for Payment Entry (#18874) 
In the Payment Entry Form, the field name for customer name is 'party' instead of 'party_name'. 
Need to change the customer_dashboard file accordingly.
 2019-09-05 15:01:38 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
Nabin Hait
f4fde51bba
Update customer.py 2019-09-05 12:33:29 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report (#18906) 2019-09-03 16:07:46 +05:30
Mangesh-Khairnar
4bcc221ee3 Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit 2019-09-02 23:18:56 +05:30
Mangesh-Khairnar
cf901da25d test: create customer credit limit on change 2019-09-02 23:18:36 +05:30
Himanshu
fffdb6f575 feat(Contacts): Multiple Emails in a Contact (#18675) 
* feat: render multiple addresses

* feat: move to newer contacts structure

* fix: iterate over valid variable

* fix: use primary label instead of bold letters

* fix: call popup get contact name from number

* fix: make contact structure  call popup compatible

* fix: query

* fix: add city, state and country

* fix: display address

* fix: get address in single line

* fix: review fixes

* fix: translation strings

* fix: fix query for contacts

* fix: remove references of mobile_no
 2019-09-02 15:57:45 +05:30
Mangesh-Khairnar
bb3cec1556 test: fetch data from customer credit limit 2019-08-31 14:32:07 +05:30
Mangesh-Khairnar
dbc69da409 fix: minor fixes 2019-08-31 14:28:02 +05:30
Mangesh-Khairnar
e3bb247868 fix: check column in credit limit 2019-08-31 13:16:14 +05:30
Mangesh-Khairnar
f856b3b559 fix: fetch customer group of the customer 2019-08-31 01:40:58 +05:30
Mangesh-Khairnar
89433b4bea fix: get credit limit 2019-08-30 22:57:51 +05:30
Mangesh-Khairnar
b3e5d11e1d fix: multiple fixes 2019-08-30 18:18:48 +05:30
Mangesh-Khairnar
c059bc3e36 fix: grid view of customer credit limit 2019-08-29 20:51:31 +05:30
Mangesh-Khairnar
5755d2d32f fix: customer credit limit report 2019-08-29 19:51:38 +05:30
Mangesh-Khairnar
79525327f0 feat: bypass credit limit check 2019-08-29 19:50:23 +05:30
Mangesh-Khairnar
36b30911a8 feat: customer credit limit 2019-08-29 18:06:23 +05:30
Suraj Shetty
55a2699f4c fix: Update dashboard of doctypes that are linked with pick list 2019-08-29 09:14:27 +05:30
Suraj Shetty
f455c92d02 fix: Remove Pick List Reference Item use Item locations table instead 2019-08-28 17:44:22 +05:30
Suraj Shetty
8de8a78235 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-26 10:51:12 +05:30
Suraj Shetty
2b9e256002 fix: Rename method name 2019-08-26 10:05:01 +05:30
Suraj Shetty
8b4d604cfd fix: Use purpose field and remove item_base_on field 2019-08-23 11:57:16 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660) 
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
 2019-08-23 11:42:35 +05:30
Suraj Shetty
da2a623e38 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-21 11:48:27 +05:30
Suraj Shetty
1a090432d9 fix: Quantity while creating pick list from work order 
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-20 12:04:07 +05:30
Suraj Shetty
182f4def00 fix: Delivery note creation from pick list 
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-16 08:16:22 +05:30
Suraj Shetty
e047de854b Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-09 11:14:14 +05:30
Suraj Shetty
4b3b358ac6 fix: Show correct label instead of showing undefined (#18559) 2019-08-02 21:46:38 +05:30
Suraj Shetty
e45102b913 fix: Show correct label instead of showing undefined (#18560) 2019-08-02 21:46:28 +05:30
Suraj Shetty
e06f486aee fix: Rename methods 2019-08-01 12:54:33 +05:30
Suraj Shetty
fbcc56536b fix: Rename Pick TIcket -> Pick List 2019-08-01 12:05:20 +05:30
Suraj Shetty
fa9111ebe2 fix: Add and rename some fields 
- Add ability to create delivery note from pick ticket
- Minor fix related to create button
 2019-08-01 11:07:14 +05:30
Rohit Waghchaure
40e35048b8 fix: can't compare datetime.date to unicode 2019-07-29 17:14:39 +05:30