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
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +05:30
Deepesh Garg
f9e4391998
Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop
...
feat: "Order Type" tree type for Sales Analytics report (develop)
2019-07-12 14:28:16 +05:30
Rucha Mahabal
9e35bff55c
feat: Email Campaign
2019-07-12 13:56:36 +05:30
Suraj Shetty
bc2ff785f1
fix: Restore "allow delivery" condition checks ( #18246 )
...
* fix: Remove `allow_delivery` flag
- User was not able to create delivery note
because allow_delivery flag was false and
it never used to get updated
* fix: Restore allow_delivery condition checks
2019-07-11 10:43:40 +05:30
Mangesh-Khairnar
d749f20f63
fix: installation note ( #18232 )
2019-07-10 19:29:39 +05:30
Don-Leopardo
93fbba4f40
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-07-10 10:52:55 -03:00
Himanshu
e7bb54ed76
feat(Issue): Settings to stop SLA tracking ( #18112 )
...
* fix: fix msgprint when creating new issues
* fix: use getdate
* fix: do not self save
* fix: test case
* fix: error due to comparing date and str
* fix: creation time for replicated issue
* feat: sla in support settings
* fix: remove sla settings
* feat: enable check in sla
* fix: throw if sla is disabled
* fix: enable sla
2019-07-10 17:15:59 +05:30
Nabin Hait
59c5c3c347
fix: Make material request against SO only for pending qty ( #18216 )
2019-07-10 17:05:49 +05:30
Rushabh Mehta
8309fcfbbc
BREAKING CHANGE: Remove anti-pattern "Project Task" ( #18059 )
...
* BREAKING CHANGE: Remove anti-pattern "Project Task"
* fix(tests): remove `tasks` from project/test_records.json
* fix(tests)
* fix(test): test_employee_onboarding.py
* fix(tests): test_expense_claim.py
* fix(refactor): cleanup project.py validate/update
* fix(refactor): cleanup project.py validate/update
* fix(test): test_expense_claim
* fix(test): test_expense_claim
* fix(test): test_expense_claim, try Test Company 4
* Update project.py
2019-07-08 10:39:30 +05:30
rohitwaghchaure
6b2075a115
Merge pull request #18161 from deepeshgarg007/additional_discount
...
fix: Additonal discount not getting set in sales transactions
2019-07-05 18:13:23 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
deepeshgarg007
a9ea49c976
fix: Additonal discount not get set in sales transactions
2019-07-04 15:56:34 +05:30
Anurag Mishra
bdec7fea82
feat: purchase order against sales order ( #17975 )
...
* feat: purchase order against sales order
* fix: remove unwanted checks
* fix:Related tests
2019-07-04 12:28:01 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Deepesh Garg
fb29ffc90c
fix: Usability fixes to Serial No and batch selector ( #18071 )
...
* fix: Usability fixes to Serial No and batch selector
* fix: Codacy
* Update sales_common.js
2019-06-28 14:08:08 +05:30
Don-Leopardo
a01d0a5311
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-06-27 18:09:09 -03:00
Deepesh Garg
ea0574679f
fix: Removed submitted status from Quotation ( #18055 )
...
* fix: Change in list view and status updater
* fix: Change status in doctype
* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 ( #18067 )
2019-06-26 10:57:45 +05:30
Aditya Hase
2caaa1b03d
fix(sales-funnel): Remove duplicate code
2019-06-25 17:17:38 +05:30
Aditya Hase
10562b67fc
fix(sales-funnel): Use frappe.Chart() instead of Chart()
2019-06-25 17:07:41 +05:30
Don-Leopardo
54b9fd5bef
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-06-24 11:29:23 -03:00
NahuelOperto
42fe68d065
feat: order type in trr type filter
2019-06-24 08:29:14 -03:00
Rohit Waghchaure
1777e60dc2
fix: test case for payment terms in quotation
2019-06-24 14:11:06 +05:30
Rushabh Mehta
41721fe1c3
Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO
...
fix: copy_payment_schedule_from_quot_to_SO
2019-06-21 09:19:20 +05:30
Deepesh Garg
23deb6f79b
fix: Default cost center fix for delivery note item ( #17990 )
2019-06-20 19:11:58 +05:30
Rohit Waghchaure
7efeffa66a
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 16:20:32 +05:30
Rohan Bansal
0426636a32
fix(customer): Improve performance by reducing queries
2019-06-17 12:16:12 +05:30
Rohan Bansal
e3a3306b30
feat(customer): Add report to show item prices per Customer
2019-06-13 14:53:33 +05:30
Rohan Bansal
250734dd24
fix(selling): Remove Totals row for tree-based Sales Analytics
2019-05-30 17:30:50 +05:30
Nabin Hait
275185438a
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-27 14:00:43 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Rushabh Mehta
a02ab2d3d7
Merge pull request #17635 from nabinhait/add-multiple-items-dev
...
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:57:03 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Deepesh Garg
0ae1c293d3
fix: Status updater fixes in PO and SO and test coverage for return ( #17491 )
...
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
Himanshu Warekar
24442af9ae
fix: use list comprehension
2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5
fix: calculate percentage only if sales team exist
2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347
fix: sales percentage equal to 100
2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c
fix: python side validation
2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f
fix: validate percentage total
2019-05-04 22:35:52 +05:30
Nabin Hait
3d64a5da5e
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign
...
feat: Additional fields in campaign
2019-05-02 03:18:22 +05:30
Nabin Hait
c0fdb80486
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-02 01:00:12 +05:30
Nabin Hait
d539def25d
Update campaign.json
2019-05-02 00:44:29 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables
...
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 19:31:00 +05:30
Rushabh Mehta
c3aecb1fbd
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 18:04:22 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount
2019-05-01 12:23:30 +05:30
Faris Ansari
4b21225cf4
fix: Map item_code to title ( #17403 )
...
When making Project from Sales Order, description was mapped
with Task title which can exceed 140 characters easily.
Description should be mapped with description as it is html field.
2019-04-29 22:41:48 +05:30
Basawaraj Savalagi
d4585efc6a
feat: Additional fields in campaign
2019-04-29 22:12:50 +05:30
ashish-greycube
4707ad2029
fix: copy_payment_schedule_from_quot_to_SO
2019-04-26 12:14:40 +05:30
deepeshgarg007
4a4ce12eb4
fix: Commonfied code for inter-company-transaction
2019-04-25 14:28:19 +05:30
Nabin Hait
593242fa5c
fix: Calculate rate based on discount on server side only if not rate or pricing rule applied
2019-04-23 13:22:38 +05:30
deepeshgarg007
555f425da1
fix: Test case and styling fixes
2019-04-22 20:24:31 +05:30
deepeshgarg007
c841bd486a
feat: Added validations and mapper to create inter company mapper
2019-04-18 20:10:31 +05:30
deepeshgarg007
90262f84af
feat: Added custom button to make inter company order
2019-04-18 20:09:07 +05:30
deepeshgarg007
100bd29dfd
feat: Updated doctypes for sales and purchase order
2019-04-18 20:08:20 +05:30
Nabin Hait
3a2d6a4043
Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements
...
feat: Production plan enhancements
2019-04-17 17:31:14 +05:30
Rohit Waghchaure
38238b0cfd
fixed test cases
2019-04-17 15:56:00 +05:30
Rohit Waghchaure
00d73cda50
fix: POS not working if user has access of multiple company
2019-04-16 18:43:16 +05:30
Rohit Waghchaure
34ee41a35e
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items
2019-04-16 18:26:11 +05:30
Nabin Hait
fa8f13dc98
Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos
...
fix: POS takes lot of time to load the items data
2019-04-15 10:11:31 +05:30
Rushabh Mehta
4f49ce4124
feat: auto assign lead/opportunity to lead owner, customer account manager
2019-04-12 09:04:17 +05:30
Rohit Waghchaure
2454d89068
Optimized the code to fix slow loading of items in the POS
2019-04-11 19:52:00 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold
2019-04-11 15:49:06 +05:30
Nabin Hait
65cca62ef9
fixed merge conflict
2019-04-11 12:32:43 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
rohitwaghchaure
4898d1936b
Merge pull request #17200 from Anurag810/pos_running
...
fix: order by idx(v11)
2019-04-11 10:57:05 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
...
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-11 09:57:45 +05:30
Anurag Mishra
9a2ae67f86
fix: order by idx
2019-04-10 17:57:23 +05:30
Anurag Mishra
5ab5f77fd4
fix: order by idx
2019-04-10 17:53:45 +05:30
Rohit Waghchaure
b286fc99b8
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-10 16:16:30 +05:30
Mangesh-Khairnar
63cf56f406
style: change function call to anonymous function call
2019-04-09 17:47:25 +05:30
Mangesh-Khairnar
b70b048fa2
style: change type comparison for boolean expression
2019-04-09 12:26:52 +05:30
Mangesh-Khairnar
16c4fd6733
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-04-09 12:13:45 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order
...
feat: provision to unlink advance payment entry on cancelation of order
2019-04-06 12:30:05 +05:30
Rohit Waghchaure
9835c89e17
Added test cases
2019-04-06 12:29:05 +05:30
rohitwaghchaure
fc471ed63b
Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop
...
fix: incorrect POS profile selected
2019-04-05 09:59:16 +05:30
Rohit Waghchaure
c2ed03f77a
always set the company from the POS Profile
2019-04-05 09:58:04 +05:30
Rohit Waghchaure
4324f43a06
always set the company from the POS Profile
2019-04-05 09:54:55 +05:30
Rohit Waghchaure
0a4aee0206
fix: POS search items not works properly if item group filter has applied
2019-04-04 16:02:15 +05:30
Rohit Waghchaure
6f3f2185ab
fix: pos takes more time to add an item in the cart
2019-04-01 16:45:47 +05:30
Rohit Waghchaure
e994494e3e
fix: POS qty decrement freezing the screen
2019-04-01 14:29:55 +05:30
Rohit Waghchaure
5fa9a7a1b4
feat: unlink advance payment entry on cancelation of order
2019-04-01 00:40:38 +05:30
Rohit Waghchaure
e540534e42
fix: Pricing rule not working for POS
2019-03-31 17:13:18 +05:30
Rohit Waghchaure
b00c16470d
fix: POS items not loading
2019-03-29 13:47:45 +05:30
Rohit Waghchaure
c7b916ac46
fix: test cases
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48
feat: provision to make Maintenance Schedule from sales invoice
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4ae221946b
renamed report
2019-03-26 11:14:06 +05:30
Mangesh-Khairnar
324e06cba0
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-03-25 18:51:13 +05:30
Rohit Waghchaure
1c1d0bb1c7
feat: commonified item group wise target variance report
2019-03-25 17:56:43 +05:30
Mangesh-Khairnar
b3ec508655
feat: record reason for hold as comment
2019-03-25 17:29:14 +05:30
Mangesh-Khairnar
bcb8b135f2
feat: ask reason for putting sales order on hold
2019-03-25 17:27:16 +05:30
rohitwaghchaure
6fabcdd5b3
Merge pull request #16978 from rohitwaghchaure/sales_partner_wise_reports
...
feat: sales partner reports
2019-03-24 14:52:45 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
Rohit Waghchaure
65d9435fd5
feat: sales partner reports
2019-03-20 12:05:21 +05:30
Himanshu
f3e5213190
feat(Support): Service Level Agreements ( #16828 )
...
* init SLA
* Added more inputs to the forms
* set priority of issue
* Removed UOM in favor of hours for tracking
* updated js to autofill values
* Removed unwanted fields
* timer functionality
* code refactor
* parenthesis fix
* fixed typo
* added new fields
* Updated fields
* Updated fields for issue doctype
* Updated fields for issue doctype
* changed doctype structure
* added new fields to issue
* code refactor
* new function to set criticality level
* changed dropdown options
* set timer for sla
* calculation of resolution and response time
* stopwatch counter
* dashboard changes
* renamed sla to support contract
* countdown timer section
* issue doctype changes
* removed unwanted imports
* fixed wrong response time and resolution time
* update response and resolution time
* calculate time to respond and resolve
* feature enhancements
* probable scheduling bug fix
* fixed scheduling issue support sent out of support time
* removed issue criticality link from support
* Changed day order
* skip date validation when support contract is default
* removed mandatory field
* fix scheduling conditions for now
* code refactor
* removed duplicate doctypes
* fixed day inserted twice in service level
* check to not add another default contract
* default support contracts
* removed commented code
* removed unused imports
* fix sla for non-listed days
* reduced redundant code and optimized it and starting unit tests
* added condition check to compute days correctly
* renamed doc as per guidelines and added conditions for scheduling
* removed per day support timings
* added response and resolution time to support contract
* scheduling based on hours kinda fix
* set sla before_update and finally fixed time scheduling out of support time
* DocType Issue removed test_records and rewrote test cases
* test cases and codacy fixes
* Doctype SLA instead of Support Contract to avoid confusion with Contract
* fixed tests failing due to change in options for time period
* change naming to Prompt
* remove unknown doctype from help_desk
* revert unwanted changes to default
* refactor get_list for fetching service_level_agreement
* change datatypes
* fix tests
* refactored tests
* remove unused imports
* code and comments refactor for better understandability
* removed and renamed doctype to service days and minor fixes
* Refactor test cases for response and resolution time for issue
* add validation to check if response time < resolution time
* minor fix for checking if current day is start day
* calculate time in js rather than python
* fix: parenthesis fixing customer dashboard
* json changes to rename sections
* refactor: alignment
* refactor: beautify code
* fix: use frm api to get the element
* fix: replace '__' with '_'
* refactor: remove pointless test
2019-03-19 16:47:56 +05:30
Rohit Waghchaure
8bfe330b37
feat: pricing rule enhancements
2019-03-19 12:44:30 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 ( #15965 )
...
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Rohit Waghchaure
5b43e2f31a
code cleanup
2019-03-18 17:00:44 +05:30
Rohit Waghchaure
ace95d5a67
feat: added cost center filter in AR/AP reports
2019-03-18 12:21:00 +05:30
Rohan Bansal
82433845e5
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
2019-03-14 13:18:55 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Himanshu Warekar
7ab961f798
remove debug code
2019-03-06 23:53:38 +05:30
Himanshu Warekar
59699bf46e
[debug] locally tests passed but travis failed
2019-03-06 23:33:03 +05:30
Himanshu Warekar
4f1737c2dd
fix sales order test for creating work order from sales order
2019-03-06 22:19:15 +05:30
Himanshu Warekar
783331c645
sales_order to work_order item desc fix
2019-03-06 18:44:04 +05:30
Deepesh Garg
e1f72cc010
revert: Address and contact report fix ( #16786 )
...
Reverts #16674
Address and other info are not visible in address and contact report
![screenshot 2019-02-27 at 11 31 38 am](https://user-images.githubusercontent.com/42651287/53469309-6029f500-3a83-11e9-9672-e5e7d14dc470.png )
2019-03-04 12:49:39 +05:30
Mangesh-Khairnar
83f1fbdc4e
test: assert validation error for sales order on hold
2019-03-02 22:24:23 +05:30
Mangesh-Khairnar
3ebeac13e9
feat: add resume funtionality for sales order on hold
2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
602223dd55
feat: add a option of on hold in sales order
2019-03-02 20:48:04 +05:30
Sagar Vora
e0eafb1c2c
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
deepeshgarg007
d2d84e3c9d
fix: Company filter fix
2019-02-26 11:52:22 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix
...
fix: Removed precision from multiple doctypes
2019-02-19 15:03:00 +05:30
deepeshgarg007
de0f59b818
fix: Removed precision from multiple doctypes
2019-02-19 08:40:16 +05:30
rohitwaghchaure
1bcbe9069b
Merge pull request #16610 from jay-parikh/hotfix
...
fix: (POS) Item listing issue in pos after submit for Multi Company POS Profile
2019-02-18 12:43:57 +05:30
Rushabh Mehta
20db65ef77
Merge pull request #16694 from rmehta/refactor-comments
...
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-18 12:05:35 +05:30
Rushabh Mehta
39c106dd05
fix(test): rename test in test_customer
2019-02-18 11:16:59 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
deepeshgarg007
34f4f24e21
fix: Address and contact report
2019-02-14 17:26:49 +05:30
Deepesh Garg
4d1bc0ca85
fix: Add total row in analytics report ( #16648 )
2019-02-13 16:58:46 +05:30
Rushabh Mehta
c8018bdeb1
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-09 21:10:29 +05:30
Jay Parikh
1906f6da3a
Fix - POS >> Item listing after submit pos >> list all the items which are not restricted to that pos profile #16588
2019-02-08 11:13:09 +00:00
Saif Ur Rehman
1a441b267d
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue
2019-01-29 11:29:41 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
deepeshgarg007
0bee62b460
fix: Made period fields read only and added validation for multiple entries by same user
2019-01-28 12:45:11 +05:30
deepeshgarg007
c2ffcc5e71
feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher
2019-01-27 16:09:07 +05:30
deepeshgarg007
49cca7ac76
fix: Customer based price_list in online POS
2019-01-25 16:41:01 +05:30
Saif Ur Rehman
37d7b80572
Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-24 23:41:35 +05:00
Saif Ur Rehman
3d275af67b
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
2019-01-24 23:40:16 +05:00
Saif Ur Rehman
d5c7410ad1
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-24 23:34:16 +05:00
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports
...
fix: Multiple fixes in the reports
2019-01-23 12:05:36 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Sagar Vora
ceacacc320
Merge branch 'master' into staging-fixes
2019-01-22 15:37:05 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest
2019-01-20 16:53:41 +05:30
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Rohit Waghchaure
fa7ee0b3b6
Added dafult bank account in the customer/supplier
2019-01-17 15:45:27 +05:30
Deepesh Garg
bce62a4bcc
Delete __init__.py
2019-01-16 22:57:45 +05:30
Deepesh Garg
70657d06f4
Delete pending_sales_order.json
2019-01-16 22:57:20 +05:30
Deepesh Garg
b8e0bfc335
Delete pending_quotation.json
2019-01-16 22:56:30 +05:30
Deepesh Garg
9cf9cb0e00
Delete __init__.py
2019-01-16 22:55:48 +05:30
Deepesh Garg
9da018d59c
Delete quotation.json
2019-01-16 22:55:10 +05:30
Deepesh Garg
23b7f0def4
Delete __init__.py
2019-01-16 22:54:17 +05:30
Deepesh Garg
e95a4053cf
Delete sales_order.json
2019-01-16 22:53:53 +05:30
Deepesh Garg
e4303111b4
Delete __init__.py
2019-01-16 22:53:00 +05:30
Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address
2019-01-16 17:51:49 +05:30
Nabin Hait
3dde949419
feat(mr_against_so): Merge same items from different BOMs
2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50
BIS issue fixes
2019-01-16 15:59:39 +05:30
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address
2019-01-16 11:17:55 +05:30
Nabin Hait
f0571ddf4b
Merge pull request #16393 from diamorafaela/quotation-currency
...
fix: Quotation to Sales Order with different currency
2019-01-16 10:13:44 +05:30
Saurabh
7d630b3e29
Merge branch 'master' into staging-fixes
2019-01-15 19:41:09 +05:30
NahuelOperto
9080221d46
fix: added test cases
2019-01-14 12:12:56 -03:00
Saif Ur Rehman
502f15ba1b
test: test_party_details_tax_category
2019-01-12 19:07:39 +05:00
NahuelOperto
7facc34851
fix: removed filter from method validate
2019-01-11 10:46:38 -03:00
Nabin Hait
c693cd7f10
Merge pull request #16341 from Mangesh-Khairnar/date-range-fix
...
fix: Sales Analytics Period Range
2019-01-10 10:35:31 +05:30
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
deepeshgarg007
8621869d24
Created multiple reports and linked them to email digest
2019-01-09 21:56:45 +05:30
Deepesh Garg
9c5e9d79f1
Merge branch 'staging-fixes' into company_address
2019-01-09 17:19:20 +05:30
deepeshgarg007
d29ee97307
Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt
2019-01-09 17:09:11 +05:30
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Nabin Hait
c190192d5f
Merge pull request #16277 from deepeshgarg007/loyalty-program-fix
...
fix: Loyalty program issue fix in customer dashboard
2019-01-08 12:15:57 +05:30
Nabin Hait
4216d86dd9
Merge pull request #16296 from deepeshgarg007/update_items_bug
...
fix: Validation while updating items in sales order
2019-01-08 11:54:52 +05:30
Nabin Hait
49ca9dceb2
Merge branch 'staging-fixes' into report-fix
2019-01-08 11:53:06 +05:30
Saif
e5091cbc0f
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs ( #16356 )
...
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
2019-01-07 18:19:30 +05:30
Saif Ur Rehman
7ea6554f1f
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
Mangesh-Khairnar
e2ea987610
fixed edge cases for yearly, weekly and monthly views
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
676a106d7a
(refactor) removed unnecessary code
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
8e47a543f6
(fix) multiple years in yearly view
2019-01-05 00:15:31 +05:30
deepeshgarg007
32f054b901
Added customer group column in item-wise-sales-history report
2019-01-03 22:57:18 +05:30
deepeshgarg007
78ad6c4cb7
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix
2019-01-01 19:46:08 +05:30
deepeshgarg007
318dc422bc
Updated test Cases for update_child_rate_qty
2019-01-01 18:30:33 +05:30
deepeshgarg007
de1e6fc1c4
Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-lost-reason
2019-01-01 08:57:18 +05:30
Nabin Hait
cacbdec565
Merge pull request #16283 from rohitwaghchaure/fix_not_able_to_delete_customer
...
[Fix] Not able to delete customer if contact is available
2018-12-31 11:55:24 +05:30
deepeshgarg007
d9a768a88f
feat: Set lost reasons in opportunity and quotation using table multiselect
2018-12-29 19:33:44 +05:30
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
Suraj Shetty
3de12db2b1
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a
More work on Tax Category and Item Tax Template
2018-12-27 02:11:07 +05:00
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c
Merge branch 'master' into staging-fixes
2018-12-26 11:44:09 +00:00
Rohit Waghchaure
52a692ee08
[Fix] Not able to delete customer if contact is available
2018-12-26 02:34:13 +05:30
deepeshgarg007
12f5cefc12
Loyalty program issue fix in customer dashboard
2018-12-25 16:06:19 +05:30
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
rohitwaghchaure
7ec5e80b70
[Fix] While making sales invoice from delivery note, system not remove the returned qty ( #16141 )
2018-12-24 14:55:31 +05:30
Charles-Henri Decultot
052033a76e
[Fix] Pos bugs ( #16256 )
...
* Remove hard-coded values
* Fix change pos profile + add campaign
* Test case for coveralls
* Remove unnecessary method
2018-12-24 14:39:30 +05:30
Mangesh-Khairnar
70c5aa5f5d
[Enhancement] Pending SO Items for Purchase Request Report ( #16188 )
...
* deleted old purchase request query report
* [Enhancement] pending so items for purchase request report refactor
* comments and format fix
* test and minor fixes
* test fixes
2018-12-24 14:25:47 +05:30
Shreya Shah
91ddadeefa
fix: add currency to options ( #16199 )
2018-12-24 14:25:12 +05:30
Raffael Meyer
ed3561279d
Update README.md ( #16224 )
2018-12-24 14:19:51 +05:30
Suraj Shetty
83e3c4c0fa
Fix quote error
2018-12-24 11:11:04 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Saif Ur Rehman
8ac261750b
Add and Modified DocTypes for Item Tax Template
2018-12-22 02:51:59 +05:00
Frappe Bot
1b7c583c48
Merge branch 'staging' into develop
2018-12-21 05:46:23 +00:00
deepeshgarg007
1ee19e4167
Analytics report graph fix
2018-12-15 15:36:09 +05:30
Frappe Bot
5b50b2848d
Merge branch 'staging' into develop
2018-12-10 13:08:33 +00:00
RicardoJohann
bc0ef0beca
Add Serial Number button in Delivery Note and Sales Invoice's Packing List ( #16080 )
2018-12-10 17:43:03 +05:30
Stavros Anastasiadis
3d82b74ea4
Update Items in Submit state can add new row ( #15644 )
...
* Update Items in Sumbit state can add new row
In Sales Order and Purchase Order when docstatus is submitted user can
use Update Item btn to add new child Items
* Remove unused code line
* Remove blocking db save thread line
* Remove Company as not standard Field in Purchase Order Item
* Minor indentation fix
* Add Unit Test, add new row in update_child_qty_rate
* Codacy fix
2018-12-10 17:30:55 +05:30
Rohan
39b31ece31
fix(pos): Return empty dict if no results found ( #16124 )
2018-12-10 17:16:39 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
deepeshgarg007
4c79274054
Fixed patch and deprecated grid reports
2018-11-30 18:01:22 +05:30
deepeshgarg007
37b6a2ca0b
row check bug fix
2018-11-30 16:15:43 +05:30
deepeshgarg007
3c7c4a61be
Test case fix
2018-11-29 14:28:01 +05:30
deepeshgarg007
3eef6411dd
Removed print statement
2018-11-29 13:10:02 +05:30
deepeshgarg007
1a1c013b2a
Analytics report bug fixes and code cleaning
2018-11-29 08:34:47 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
Nabin Hait
72fc1b57be
Merge pull request #16083 from Anurag810/new-fix-branch
...
[fix] delivery note with quantity equal 0 #14211
2018-11-27 13:10:31 +05:30
Nabin Hait
91c811f170
Merge branch 'staging-fixes' into new-fix-branch
2018-11-26 20:23:37 +05:30
deepeshgarg007
05c2989698
removed total from graph
2018-11-26 20:19:57 +05:30
Nabin Hait
d0af0887be
Merge pull request #16051 from SaiFi0102/patch-1
...
Remove "Test" Letter Head
2018-11-26 19:47:07 +05:30
Anurag Mishra
5b6dd58b3e
fixed ZeroDivisionError in sales_order.py
2018-11-26 17:22:50 +05:30
Anurag Mishra
e657fe84b8
making validation generic for sales order,sales invoice,purchase order etc.
2018-11-26 17:13:10 +05:30
Nabin Hait
48e0e19b03
fix(test): Fixed salary slip and sales analytics test cases
2018-11-26 11:05:28 +05:30
deepeshgarg007
9cdece4ca2
Test case fix and other minor bug fix
2018-11-26 11:05:28 +05:30
Kanchan Chauhan
962397e6f4
Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate
2018-11-22 15:15:06 +05:30
Saif
2a2f2742eb
Remove "Test" Letter Head
2018-11-21 23:29:09 +05:00
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Saif
60ec88bcc8
Added Default Warehouse field that sets all item's warehouse ( #15462 )
...
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied
* Set def_warehouse in test_sales_order.py
* Changed from def_warehouse to set_warehouse
* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Shreya Shah
89974b221d
[Feature] Create Raw Material Request from Sales Order ( #15452 )
...
* Add new button to Sales Order form - Request for Raw Materials
* Modify get_work_order_items function
* Commonify functions in Production Plan to make it compatible with new feature
* Create and submit Material Request from Sales Order
* Link Sales Order with Material Request
* Minor
* Rename label
* Fix Codacy
* Modify as per review suggestions
- Move dialog to a new function
- Move checkboxes below other fields
* Minor changes
* Check for permissions
* Add common checkboxes for all items
* Fix codacy
* fix: Travis
* fix: Use variable to store query result
* fix: Add comment before fetching exploded items
* refactor: Break into multiple functions
* test: Add test case
2018-11-13 11:15:03 +05:30
Zarrar
6922415d1b
[New Feature]Scan Item Barcode label to quick create/update records in items child table ( #15731 )
...
* Update transaction.js
* setup barcode scan
stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js
* fix bug of item_code change always reset qty to 0
when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0.
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* clean up barcode logic for transactions
* call scan_barcode method for stock entry
* separate out logic for searching serial, batch or barcode number
* added scan barcode field in transactions doctype
* search barcode-serial-batch sequence, code rectify
* hide all barcode related field if disabled from settings
* remove print statement
* Update stock_entry.py
2018-11-13 11:11:32 +05:30
Deepesh Garg
6714214951
Server side script report for sales analytics ( #15589 )
...
* Sales Analytics Report
* Codacy issue fixes and name column addition
* Minor Fixes
* Minor Changes
* Codacy Issue Fixes
* Codacy Issue Fixes
* Bug Fixes
* Code cleaning and optimization
* Deleted Duplicate code
* Indentation Issue Fixes
* Added Supplier Condition
* Cleaned code and better function naming
* Added report link for sales analytics in selling.py
* fix(patch): Patch to delete old analytics reports
* feat(refactor): Created class and refactored code using object oriented paradigm
* Column condition fix
* Minor condition fix
* Minor fix
* parent child map for purchase analytics
* Minor Fixes in get_periodic_data
* Used dots for filters instead of brackets
* Minor Bug fix in get_period_date_ranges
* Test Cases for Analytics Report
2018-11-12 16:15:54 +05:30
lasalesi
32ab3970e1
allow creating sales order on the last valid day of a quotation ( #15875 )
2018-11-05 16:02:18 +05:30
Zarrar
92a4ff4e81
Merge pull request #15874 from shreyashah115/portal-fixes
...
Add overdue status for sales order
2018-11-01 10:46:08 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop
2018-10-31 13:51:52 +00:00
Ameya Shenoy
961849beb4
Merge branch 'master' into staging-fixes
2018-10-31 13:43:12 +00:00
Shreya Shah
e140845399
Revert "Add overdue status for sales order"
2018-10-31 18:20:28 +05:30
Shreya Shah
b95d7ae41b
Merge pull request #15870 from shreyashah115/portal-fixes
...
Add overdue status for sales order
2018-10-31 18:20:18 +05:30
Shreya Shah
41c5fda196
fix(sms-center): Fix db query ( #15774 )
2018-10-31 18:04:30 +05:30
Shreya
e3a7c68d4f
fix(portal): Add overdue status for sales order
2018-10-31 16:00:27 +05:30
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +00:00
Ameya Shenoy
ca66c7ba14
Merge branch 'master' into staging-fixes
2018-10-23 08:01:13 +00:00
Ameya Shenoy
3a11f34355
fix(): fetch correct warehouse for item in report
...
Fix 'Sales Person-wise Transaction Summary' Report by fetching the
correct Warehouse for the Item fron the respective, Sales Order/Sales
Invoice/ Delivery Note
2018-10-22 10:15:07 +00:00
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop
2018-10-17 09:44:39 +00:00
deepeshgarg007
0cbb9b54fa
Deprecating subscriber doctype ( #15695 )
...
* Depricating subscriber doctype
* Removed naming series
2018-10-16 14:39:16 +05:30
deepeshgarg007
4bb90add1d
Currency symbol bug fix ( #15698 )
2018-10-15 19:07:49 +05:30
deepeshgarg007
7c443264a4
Currency symbol bug fix ( #15690 )
2018-10-15 18:22:28 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
deepeshgarg007
1cb1074f6b
Bug Fix ( #15640 )
2018-10-10 16:15:30 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
Charles-Henri Decultot
75fa6b3ee8
[Enhancement] Improvement to the sales pipeline ( #15524 )
...
* Additions to sales pipeline
* Codacy corrections
* Codacy corrections
* Codacy corrections
* Replace _ with dummy for unused variable
* Performance + dates corrections
* Itertuples modification
* Removing trailing whitespaces
* Sales stage doctype
* Divide sales stages fixtures in separate functions
* Remove duplicate fixtures
* Add newline after method
* Missing requirement
2018-10-03 10:41:40 +05:30
Sharath C
1c44d93b93
Is frozen and Disabled Columns added to Customer Credit Report ( #15560 )
2018-10-03 10:41:11 +05:30
deepeshgarg007
719701f2a4
Enhancement in Budget Variance and other reports ( #15455 )
...
* Enhanced Budget Variance report and added filters and columns in other reports
* Update budget_variance_report.js
* Changes in budget variance report
* Spacing in column names
2018-10-02 12:52:13 +05:30
Charles-Henri Decultot
b2281cc1fd
Lead to customer UX enhancement ( #15525 )
...
* Lead to customer UX enhancement
* Market segment
* Market Segment to DocType
* Specific function for fixtures
* Merge issue correction
* Doctype merge correction
2018-10-02 11:25:00 +05:30
Saif
90cf2ddc01
Make pricing rule from Supplier and Customer Doc ( #15533 )
...
* Make pricing rule from Supplier and Customer Doc
* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +05:30
Charles-Henri Decultot
4fd7a4e0d7
Lead notes ( #15510 )
...
* Notes field in Lead
* Add notes to lead details report
2018-09-30 21:20:55 +05:30
Suraj Shetty
4b404c4f1e
Avoid multiple escapes ( #15509 )
2018-09-27 15:39:34 +05:30
Suraj Shetty
6ea3de9521
Fix quote issues ( #15497 )
...
* Fix quotes issues
* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
2018-09-26 18:15:53 +05:30
deepeshgarg007
c3772f1ac4
minor fix ( #15503 )
2018-09-26 15:55:43 +05:30
Ameya Shenoy
430c3c88ff
Merge branch 'staging' into develop
2018-09-26 07:32:45 +00:00
deepeshgarg007
86152eb5c8
Sales person Commission Report and more ( #15431 )
...
* Commission For Sales Person
* Changes Made
* Changes made in sales person dashboard and commission report
* Update sales_person_commission_summary.py
2018-09-25 19:08:16 +05:30
Zarrar
b113349f31
minor fix for auto-opt-in for customer ( #15483 )
2018-09-24 14:30:07 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Nabin Hait
9fde97cdd2
Fixed merge conflict
2018-09-12 15:45:20 +05:30
rohitwaghchaure
713cfc786f
[enhance] Payment order ( #15056 )
2018-09-11 17:40:37 +05:30
Alchez
e52ae4eacb
[Fix] 'To Bill' status even if the amount is zero ( #14784 )
...
* Fix 'To Bill' status even if the invoice amount is zero
* Modify fix to only apply on Delivery Note documents
2018-09-06 18:27:06 +05:30
Zarrar
1b37186460
set POS Invoice format only if its enabled ( #15326 )
2018-09-06 13:25:52 +05:30
Nabin Hait
ffeff2d385
fix(tests): reset session user as administrator after running tests
2018-09-06 12:45:07 +05:30
Saurabh
1fe1884b73
Merge branch 'master' into develop
2018-09-03 17:00:17 +05:30
Shreya Shah
bb88e964a4
Remove unnecessary code ( #15296 )
2018-09-03 13:01:12 +05:30
Nabin Hait
f1a3fbdb6b
minor fixes in dropship
2018-08-31 17:05:20 +05:30
Fisher Yu
2e5c776293
Update sales_order.py
...
1. filter out the suppliers by which the dropship purchase order already created
2. allow create multi dropship draft purchase orders
2018-08-31 17:05:20 +05:30
Fisher Yu
102bc7f5cf
Update sales_order.js
...
for creating dropship purchase orders, allow the user to leave supplier field empty, it will auto create all dropship purchase orders for multi suppliers assigned to sales order items.
2018-08-31 17:05:20 +05:30
Rushabh Mehta
49f9747385
major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc ( #15267 )
...
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc
* fix: remove debug
2018-08-30 18:50:48 +05:30
Rushabh Mehta
13bcc4e27e
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
Charles-Henri Decultot
25712f8d65
Sales order correction ( #15190 )
2018-08-23 10:51:44 +05:30
Shreya Shah
0631aed3d9
Discount amount field in all transactions' child tables ( #15124 )
...
* Add discount_amount and base_discount_amount in Sales Invoice Item
* Add patch for existing documents
* Discount amount field in all child tables of Purchase and Selling
* Remove console statements
2018-08-14 10:51:48 +05:30
Nabin Hait
9a33bc6417
optimizing transactions by caching
2018-08-09 10:47:09 +05:30
Himanshu Mishra
859d942b22
Cached calls ( #15109 )
...
* [optimize]: bin updates
* [optimise]: use frappe.get_cached_value instead of get_value for item
* [fix]: change db.get_cached_value to get_cached_value
2018-08-08 18:33:50 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Meritsystems
1ad8eca4e8
Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. ( #14895 )
...
* Update point_of_sale.py
* Update point_of_sale.py
Add custom field(Display Items In Stock) to POS Profile Doctype of type Check.
* New field " Display Items in Stock" added
* Update point_of_sale.py
* Update point_of_sale.py
ORM used instead of SQL
used Bin to find actual quantity balances.
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
2018-08-07 14:38:50 +05:30
Ranjith Kurungadam
752fd5a7a0
Tests SO for Serial No based delivery ( #15072 )
...
* fix remove SO from Serial No only when voucher SE
* SO tests - delivery by Serial No
2018-08-03 10:39:51 +05:30
KanchanChauhan
e1f0be6da5
Delivery Date Change based on Delivery Date change in child table ( #15068 )
2018-08-01 18:11:58 +05:30
Ranjith Kurungadam
d54991d624
Delivery by Serial No ( #15030 )
...
* fields added for delivery by Serial No
* SO - validate item for delivery by Serial No
* Stock Entry - add Serial No on production, validate reserved consumption
* add item by reservation to transaction if delivery by Serial No
* SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice
* Sales Order - validate Ensure Delivery by Serial No
* Serial No - remove SO ref on cancel
2018-08-01 17:47:07 +05:30
Nabin Hait
e45ec661ea
Additional fields in Item Price ( #14540 )
...
* [IMPROVEMENT] Item Price New Fields and Features
* [IMPROVEMENT] Item Price
- Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
- Stock Setting to accept Default Price List for Purchase or Sales Item
- Move Item Section in Item Price
* Fetch default Item Price based on Customer as null
* test fixes
* Code cleanup and fixed the issue of incorrect item price fetched against the customer
* Removed min qty from packing_increment calculation
* Removed auto_update_price_list_rate from the stock settings
* Revert sales_order.json changes
* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings
* Removed unnecessory file
* Fixed item price validation code
2018-08-01 17:44:34 +05:30
Zarrar
89c87fd6a6
[Minor] Patch fix ( #15041 )
...
* update modified date
* remove extra parameter from function call
2018-07-30 10:57:47 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Rushabh Mehta
69fa808def
[minor] fixes + patch ( #14937 )
2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832
Defaults in Item Group ( #14874 )
...
* Add Defaults table in Item Group
* Fetch defaults from Item group if not found in Item
* Add patch
* Remove default fields from Item Group
* Set query for defaults
* Fix Codacy
* Modify test records
* Modify budget.py and sales_order.py
* Remove join from query
* Else condition to avoid error if no defaults found
* refrain from making item test records before item_group
* default cost center fetch correction
* Remove tab item group from query
2018-07-17 18:01:44 +05:30
rohitwaghchaure
a76067eea1
[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order ( #14899 )
...
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order
* Added test cases
2018-07-17 16:50:50 +05:30
Saurabh
af479c8192
set valid delivery date ( #14890 )
...
* set valid delivery date
* calculate delivery date based on diffrence in transation date and delivery date of ref doc
2018-07-17 16:49:32 +05:30
Saurabh
e78a877202
patch fixes ( #14936 )
2018-07-17 16:38:11 +05:30
Zarrar
26c9b94cc6
[ Improv ] Loyalty Program more fixes and test case ( #14888 )
...
* remove console statements
* set account & cost center for redemption
* add test case for single/multi tier & is_return scenario
* reset tier when changing loyalty program
* make loyalty fields non copy type
* fix test case - delete si after every test to avoid interference
2018-07-16 18:11:53 +05:30
Nabin Hait
b2da082798
Fixed logic and tests
2018-07-13 17:02:08 +05:30
Doridel Cahanap
6f06cc27e6
Update Qty and Rate in PO and SO
2018-07-13 17:02:08 +05:30
Zarrar
5899d98077
[ Major ] Loyalty Program Fixes ( #14863 )
...
* fix checking of customer_group & territory of customer in loyalty program
* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options
* removed disabled field, added from_date & to_date
* loyalty program section made collapsible, added redeem check in it
* setting loyalty program improvised, manual selection if multiple found
* get_query added, amount calculation updated
* args passed rectified for expiry_date
* get loyalty_points logic improv, redemption_details logic added
* improv based on from/to date and other rectification
* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
2018-07-11 14:35:43 +05:30
Saurabh
db7324890f
Merge branch 'master' into develop
2018-07-09 15:53:51 +05:30
rohitwaghchaure
6be8bea934
Provision to view return entries in Sales Person-wise Transaction Summary ( #14830 )
2018-07-08 19:25:13 +05:30
Shreya
9bcb959f81
Print hide loyalty program related fields
2018-07-06 18:17:02 +05:30
Saurabh
1cfcf70905
Resolved merge conflicts
2018-07-06 13:18:44 +05:30
rohitwaghchaure
3f5e80ebe3
Allow bulk edit for the sales invoice item ( #14826 )
2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd
Loyalty Program ( #12631 )
...
* First Cut for the Loyalty Program
* finished the collection part
* redmeption for the loyalty point
update the loyalty point entry in the FIFO style
make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
update the outstanding balance in the client side
* completed for the desk viewe
* wrap up for the desk and shopping cart
* pos
* fix and test the travis
2018-07-06 12:36:57 +05:30
Mohammed R Abukhamseen
8662a4f677
POS - Translate some text & numpad ( #14765 )
...
* make label & placeholder translatable
* numpad translatable
* Update point_of_sale.js
remove debugger
2018-07-01 16:44:09 +05:30
Himanshu Mishra
7aabef2026
Add configurable frequency in Selling Settings for update of project … ( #14670 )
...
* Add configurable frequency in Selling Settings for update of project and company
* remove redundant code
* remove redundant code, only trigger calculation if order/invoice is present
* removed dangling commas as per common convention in hooks
* fix:handling multiple documents
* Update selling_settings.json
2018-06-28 23:43:23 +05:30
Nabin Hait
7324815fdb
map payment terms template from SO to SI
2018-06-28 23:12:02 +05:30
Manas Solanki
3ff7f79cc7
Merge pull request #14740 from manassolanki/fix-20
...
[minor] fix for the args in the frm.call
2018-06-28 20:47:25 +05:30
Manas Solanki
89e7f8b387
[minor] fix for the args in the frm.call
2018-06-28 20:44:53 +05:30
Charles-Henri Decultot
8b22310d66
Allow auto repeat update ( #14706 )
...
* Allow auto repeat update
* Allow auto-repeat reference update
2018-06-28 14:27:58 +05:30
Nabin Hait
e2a8120ef8
ignore user permissions for some fields
2018-06-26 15:27:34 +05:30
Manas Solanki
860e169081
Update sales_order.js
2018-06-26 11:45:04 +05:30
Kanchan Chauhan
bddebb52d6
Allow only submitted Blanket Order in PO/SO
2018-06-26 09:31:27 +05:30
rohitwaghchaure
3a595d07d0
[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases ( #14649 )
...
* [Fix] POS Closing Voucher, on save collected amount becomes zero
* Added test cases for the POS Closing Voucher
2018-06-25 10:10:29 +05:30
rohitwaghchaure
ae276bcaa1
Don't allow to sale asset item from POS ( #14623 )
2018-06-21 13:18:01 +05:30
rohitwaghchaure
79e5b07e62
[Fix] Subscription method ( #14604 )
...
* [Fix] Subscription method path
* [Fix] Condition
2018-06-21 12:58:14 +05:30
Zarrar
e25dcd2737
[Minor] Report related fixes ( #14620 )
...
* fix in query incase list is empty
* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated
* unset currency filter to apply default currency or so
* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Saurabh
59798b4e88
resolved merge conflict
2018-06-20 15:23:25 +05:30
Nabin Hait
8eeb5694ba
Fixed qty in item-wise sales history report
2018-06-18 17:41:27 +05:30
Zarrar
e0adb6bbd6
cost_center overridden by company's default fix in SI ( #14560 )
2018-06-18 15:49:12 +05:30
Nabin Hait
b2d3c0f040
Update ordered qty in blanket order
2018-06-14 15:56:29 +05:30
Manas Solanki
e5e87f7137
[feature] Blanket Order
...
- Creaete Sales or Purchase order from the blanket order
- If there is any blanket order for the customer/supplier rates will be fetched from that order
- Manually selecting the Blanket order will change the rates accordingly
- Upon submission of the order, the ordered qty will be updated in the Blanket Order
2018-06-14 15:55:38 +05:30
Manas Solanki
2fb63e1724
init the blanket order
2018-06-14 15:55:37 +05:30
Zarrar
14a9c0706b
Merge pull request #14461 from mntechnique/sales_partner_type
...
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30
Zarrar
17089eeac3
[Minor] Fetching and appending items in Stock Reconciliation fix ( #14509 )
...
* minor fix in get_list of items in stock reconciliation
* reload doc fails because of backdated modified date
* item and item defaults should load prior to shopify refactor
* attribute value should't be none or empty, could be zero though
* Update item.py
2018-06-14 11:54:18 +05:30
deepak-mnt
b95f60c6f3
minor changes
2018-06-12 16:04:49 +05:30
deepak-mnt
4ec283d775
patch for sales partner type field
2018-06-11 14:53:25 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop
2018-06-06 05:53:19 +00:00
Charles-Henri Decultot
a774f3d7a0
POS closing voucher ( #14270 )
...
* POS closing voucher
* Codacy corrections + improvements
* Codacy corrections
* POS Closing Voucher improvements
2018-06-06 10:22:13 +05:30
Shreya Shah
5103454642
New Report Address and Contacts ( #14307 )
...
* New Report Address and Contacts
* Fix codacy
* Add links to report in module pages
2018-06-05 10:44:36 +05:30
rohitwaghchaure
ce642d73cb
[Fix] Special character issue while upadting customer group in customer ( #14312 )
2018-06-01 15:11:21 +05:30
Saurabh
824e068d0a
typo fix
2018-05-31 18:11:05 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Zarrar
39c0add5a2
query fix sales-person-target-variance-item-group-wise ( #14271 )
2018-05-30 11:56:58 +05:30
Nabin Hait
153536bf70
minor test fixes
2018-05-29 10:58:57 +05:30
Zarrar
b9f54ca946
[Enhance] Group same items during printing Delivery Note, Invoices, etc ( #14250 )
...
* add doctypes allowed to group items, average the rate
* add check field to group items during print
* call common before_print in delivery note
* fix precision issue while calculating average
2018-05-28 17:41:09 +05:30
Shreya Shah
e329038aaa
Total Quantity in Sales and Purchase DocTypes ( #14114 )
...
* Add field to all sales and purchase doctypes
* Add patch to update existing records
* Modify taxes_and_totals.py
2018-05-28 11:49:08 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop
2018-05-22 09:18:38 +00:00
Nabin Hait
19ce904030
Report added in Selling module
2018-05-21 11:07:04 +05:30
Nabin Hait
2cfc247d88
customers without any sales transactions
2018-05-21 11:03:02 +05:30
Nabin Hait
1bf2576e0e
Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818
2018-05-21 10:47:40 +05:30
Basawaraj
6d334b8135
Added Report : Customers Without Any Sales Transactions
2018-05-17 16:54:03 +05:30
Manas Solanki
38667ab8da
return defaults according to the company
2018-05-16 17:00:05 +05:30
Rohit Waghchaure
23942701f1
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
2018-05-16 15:41:00 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
...
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Manas Solanki
bbd8508783
optimize the patch
2018-05-16 13:00:56 +05:30
Manas Solanki
b16a4ec79e
changes for the default cost center
2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Shreya Shah
4f40b2dca5
[Fix] Sales Person Reports ( #13987 )
...
* Fix Sales Person Reports
- Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions.
* Fix codacy
* Modify as per the review comment
2018-05-16 11:22:59 +05:30
rohitwaghchaure
e48b47fc0c
Production Plan, do not consider the sales orders against which work order has been created ( #13800 )
...
* Production Plan, do not consider the sales orders against which work order has been created
* Added test cases
2018-05-16 11:07:55 +05:30
rohitwaghchaure
9a0aea8abc
Merge pull request #14046 from shreyashah115/min-fix
...
[Minor] Fixes for Customer DocType
2018-05-15 16:30:46 +05:30
Shreya
8e386167b8
Set Mandatory from client-side
2018-05-15 16:09:53 +05:30
Shreya
f636503dc1
[minor] Fix customer doctype
2018-05-15 15:57:27 +05:30
Saurabh
62a59301ef
[fix] resolved merge conflicts
2018-05-15 13:02:40 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Zlash65
0a50554417
doctype level changes
2018-05-14 11:45:38 +05:30
Faris Ansari
f2b3307136
Remove escaped customer string ( #13986 )
...
- no need to escape strings that are passed to the values parameter of the sql method
- this query was failing for inputs like "D'Arby" which have quotes
2018-05-11 21:07:27 +05:30
Zarrar
f2df7f32fa
update subscription to auto_repeat across dashboards ( #13956 )
2018-05-08 16:06:36 +05:30
Nabin Hait
fdc67a577f
Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations
2018-05-07 13:12:16 +05:30
Nabin Hait
4bbe5fbefc
Fixes related to auto repeat
2018-05-05 12:32:59 +05:30
KanchanChauhan
f4feedace4
Allow changing of Address after Submit ( #13747 )
2018-05-03 19:08:54 +05:30
Suraj Shetty
00cced12a0
Success Action ( #13666 )
...
* success action config for sales invoice
* remove "Notification Control" doctype and its usage
* add default success action after_install or while migration (patch)
* rename for_doctype to ref_doctype
* case change
* minor fix
* Remove unnecessary code
* Replace message with translatable message
* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Zarrar
6f3594b2e4
[Enhance] GL Entry - ability to multiselect party ( #13769 )
...
* change dynamic link to multiselect field and improv
* print based fix
* refactor changes according to multiselect changes
2018-05-03 19:00:43 +05:30
Prateeksha Singh
a7c6ff8f3e
Merge pull request #13837 from shreyashah115/serial-batch-linking
...
Serial No. and Batch No. linking
2018-05-02 15:11:19 +05:30
Shreya
7946ca216e
Internal Customer check in Customer
2018-05-02 14:34:14 +05:30
Shreya
eb54331d5f
removed color field from sales order and work order
2018-05-01 18:56:06 +05:30
Shreya
a7b2fc9250
color field for calendar in sales order and work order
2018-05-01 18:55:17 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Shreya
a20157af17
on item, warehouse and batch triggers, fetch serial nos based on batch
2018-04-26 14:39:21 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Rohit Waghchaure
8441dd9184
[Fix] Item with special character not adding in the POS cart
2018-04-19 12:55:06 +05:30