Pranav Nachnekar
04e3a506e4
fix: Primary address not being fetched for customer ( #19667 )
...
* fix: priamry address not being fetched
* add doctype to filter for customer_primary_address
* remove get_customer_primary_address_method
2019-11-25 12:04:00 +05:30
0Pranav
a077795581
fix tests
2019-11-25 12:01:00 +05:30
0Pranav
eefc492ff4
call commit after sql query for schedular job
2019-11-25 10:51:27 +05:30
0Pranav
6c368e2dfb
submit quotation in test
2019-11-22 13:22:12 +05:30
0Pranav
b3354198f1
Fix sql query in set_expired_status
2019-11-22 12:38:43 +05:30
0Pranav
f5112905dc
import make_item method in tests
2019-11-21 13:19:44 +05:30
0Pranav
4a28144941
add tests
2019-11-20 15:53:19 +05:30
0Pranav
5717a265b7
remove: unused imports
2019-11-20 15:31:13 +05:30
rohitwaghchaure
238521c2bd
Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile
...
feat: multiple company pos profile
2019-11-19 18:39:06 +05:30
Mangesh-Khairnar
c436d93303
fix: reset pos profile when default doesn't exists
2019-11-19 18:21:53 +05:30
Pranav Nachnekar
e13b769813
use nowdate
instead of date.today()
...
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2019-11-19 12:04:30 +00:00
0Pranav
b9460ed22c
switched ORM methods for single SQL query
2019-11-19 10:46:07 +05:30
Mangesh-Khairnar
f69b9a8c47
fix: fetch default pos profile user for the company
2019-11-15 16:54:26 +05:30
0Pranav
53b65ab8ed
Add status expired to doctype quotation
2019-11-15 16:42:32 +05:30
rohitwaghchaure
6424416886
fix: sales order item shwoing incorrect produced qty ( #19584 )
2019-11-15 14:18:45 +05:30
0Pranav
f75ea952e3
Added expired status to quotation
2019-11-13 11:03:53 +05:30
Mangesh-Khairnar
2f44480d69
enhancement: Item-wise sales history report ( #19500 )
...
* refactor(item-wise-sales-history): convert query report to script report
* refactor: add columns, fetch data
* refactor: shift company set func to utils
* fix: add filters
* fix: minor changes
* fix: fetch all the descendants
2019-11-11 10:54:12 +05:30
Diksha
7091a2102c
fix(sales order): rename delivery to delivery note on sales order make button
2019-11-04 12:03:35 +05:30
Mangesh-Khairnar
e3bc213262
feat: multiple company pos profile
2019-11-01 22:35:08 +05:30
Rohan
8728e94dbd
Merge branch 'develop' into develop-company-address-label
2019-10-29 11:26:00 +05:30
Suraj Shetty
83b58352ce
fix: Overwrite default cost center if item has default cost center set. ( #19405 )
2019-10-28 12:05:30 +05:30
Rohan
962f4eb96c
Merge branch 'develop' into develop-company-address-label
2019-10-23 15:57:26 +05:30
Nabin Hait
bd6b1806cd
fix: fixed asset register report and made skip-dn field hidden
2019-10-22 14:28:37 +05:30
Deepesh Garg
6208755d54
fix: Unable to add details in quotation and opportunity ( #19354 )
2019-10-21 13:29:44 +05:30
deepeshgarg007
737ec6b26e
fix: Travis
2019-10-20 17:36:36 +05:30
Rohan Bansal
83740de636
fix(selling): Add missing label to company address field
2019-10-16 15:16:00 +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
deepeshgarg007
683a89a415
fix: Chart fix in Analytics report
2019-10-12 23:02:53 +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
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +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
rohitwaghchaure
6bbc834f8f
Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue
...
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
2019-09-19 18:01:03 +05:30
Rohit Waghchaure
6daab3ca89
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given)
2019-09-19 17:01:49 +05:30
Marica
d793e39b6d
fix: Customer Credit Balance Report query fix ( #19104 )
2019-09-18 19:59:31 +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
Deepesh Garg
cffe577028
fix: Add UOM in anlytics report when viewing based on item ( #18902 )
2019-09-05 16:03:15 +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
c78c86663d
Update customer_credit_balance.py
2019-09-05 12:24:37 +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
Nabin Hait
d8c262fd5c
fix: Translations of strings ( #18825 )
2019-08-23 16:32:58 +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
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +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
Rohan
fc04d334da
Merge branch 'develop' into develop-customer-item-price-report
2019-08-01 17:51:03 +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
Suraj Shetty
64f174fcaa
feat: Get item location from reference items
...
- Add option to get items from multiple sales order
- Add some required fiels to Pick TIcket Reference Item
2019-07-26 13:22:05 +05:30
Suraj Shetty
0576ad5ef9
fix: Move pick list creation code to picklist.py file
2019-07-24 15:16:03 +05:30
Suraj Shetty
778b4926bf
fix: Fetch warehouse location from Bin
2019-07-24 11:27:32 +05:30
Rucha Mahabal
d23a95c06e
fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign
2019-07-22 12:26:52 +05:30
Rucha Mahabal
a566b4e24a
Merge branch 'develop' into email-campaign
2019-07-19 15:07:56 +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
06b56adc71
Merge branch 'develop' into develop-customer-item-price-report
2019-07-17 17:29:42 +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
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes
2019-07-16 16:17:07 +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
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
Rucha Mahabal
bbb22ad082
fix: child table naming
2019-07-15 17:52:50 +05:30
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
deepeshgarg007
f7395916c8
fix: Accounting Dimensions in Customer Credit Balance report
2019-07-14 18:44:32 +05:30