rohitwaghchaure
225ac0dac3
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-08 10:31:21 +01:00
tunde
24cb494a3b
Revert "Revert "make payment_schedule field no-copy""
...
This reverts commit fbd895d781
.
2017-09-08 10:07:39 +01:00
tunde
fbd895d781
Revert "make payment_schedule field no-copy"
...
This reverts commit 4f4148b0da
.
2017-09-08 10:06:46 +01:00
tunde
199daf7ac5
Merge branch 'develop' into payment-terms
2017-09-08 09:59:13 +01:00
tunde
4f4148b0da
make payment_schedule field no-copy
2017-09-07 18:49:10 +01:00
Nabin Hait
d4e57a38a4
Fixed multiple ui test cases
2017-09-07 19:16:38 +05:30
tunde
9085a5e52d
more test cases for quotation, purchase/sales order
2017-09-07 14:31:33 +01:00
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
tunde
67f3d854bc
test for quotation
2017-09-07 12:22:48 +01:00
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
Vishal Dhayagude
c79d14190f
[fix] travis failed ( #10702 )
2017-09-07 16:05:41 +05:30
Rohit Waghchaure
c72d08e8b9
Added indicator to show stock is available or not
2017-09-06 14:56:08 +05:30
tunde
9e32387aa7
fix customer test records
2017-09-06 09:44:45 +01:00
tunde
98fd5401ff
test customer
2017-09-06 08:47:14 +01:00
Rohit Waghchaure
7419c4b577
Fixed test cases
2017-09-06 12:44:51 +05:30
Faris Ansari
4bcaeb312c
fix codacy
2017-09-05 17:30:22 +05:30
Faris Ansari
e4434d3200
Merge branch 'develop' into pos-refactor
2017-09-05 17:18:04 +05:30
Faris Ansari
62b1dc777e
Namespace PointOfSale class
2017-09-05 17:10:24 +05:30
tunde
7f9a462506
Merge branch 'develop' into payment-terms
2017-09-05 01:35:51 +01:00
mbauskar
7faac85fff
Merge branch 'master' into staging
2017-09-04 14:50:32 +05:30
mbauskar
d32f08f6ec
Merge branch 'master' into develop
2017-09-04 14:50:31 +05:30
Makarand Bauskar
cf9e986f82
[hotfix] fixed the invalid variable name lead.name ( #10648 )
2017-09-04 10:25:37 +05:30
Francisco Roldán
11355cd3c9
Set at lost translated in quotation ( #10652 )
2017-09-04 10:14:58 +05:30
Makarand Bauskar
d6922b2de3
[hotfix] lead name should available before creating new customer from quotations ( #10642 )
2017-09-01 18:45:40 +05:30
Rohit Waghchaure
6ab630371d
Fixed serial no trigger not working from dialog box
2017-09-01 17:02:42 +05:30
tunde
657ecd5227
adjustment: removes credit_based_on field
2017-08-31 16:06:56 +01:00
Rohit Waghchaure
3e43927767
Test cases
2017-08-31 18:21:27 +05:30
tunde
2775175b17
add payment terms to customer master
2017-08-31 11:52:14 +01:00
tunde
226164d81c
add payment terms in customer master
2017-08-31 09:41:25 +01:00
Rohit Waghchaure
7e752c4ebf
Added patch, fixed codacy issue
2017-08-31 00:31:35 +05:30
Faris Ansari
1116f96aee
Grand Total Value width
2017-08-30 12:53:08 +05:30
Faris Ansari
491108a198
Merge branch 'develop' into pos-refactor
2017-08-30 12:37:05 +05:30
tunde
a19ea6e2f3
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms
2017-08-29 15:26:50 +01:00
Rohit Waghchaure
70aaff46be
minor fix in item group search
2017-08-29 19:19:58 +05:30
Faris Ansari
c70bbacd34
Add online, offline option, fix search
2017-08-29 15:27:17 +05:30
Faris Ansari
655f86d5e2
UI fixes
2017-08-29 14:27:01 +05:30
Rohit Waghchaure
ba3f0e6b70
Added serial no, batch no, item group functionality
2017-08-28 19:45:58 +05:30
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Vishal Dhayagude
c3a2204653
[UI Test] UI Test for Sales Order Cancel, amend and save ( #10570 )
2017-08-28 11:09:35 +05:30
Faris Ansari
3ae9e91bcd
Add memoization in search
2017-08-27 14:04:23 +05:30
Faris Ansari
d733b7d7d0
Styling and code fixes
2017-08-27 13:56:33 +05:30
Rohit Waghchaure
5e2d2059fe
Added email, edit on form view from POS, pay using numpad functionality
2017-08-27 08:54:40 +05:30
Faris Ansari
5d9196960e
new form improvements
2017-08-24 17:09:34 +05:30
Rohit Waghchaure
e5f6b4d640
Added print, make new invoice from POS functionality
2017-08-24 15:27:55 +05:30
Faris Ansari
6d2f6c2e4d
Search improved, code refactor
2017-08-23 16:25:16 +05:30
Faris Ansari
26df5b8c00
Connect Numpad events with POSCart
2017-08-23 13:12:12 +05:30
Rohit Waghchaure
b73321c577
Item search refactor
2017-08-23 12:15:10 +05:30
tunde
10fc880b06
Merge branch 'develop' into payment-terms
2017-08-21 18:27:46 +01:00
Faris Ansari
78c81d9c6c
Refactor payment code
2017-08-21 15:05:33 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
rohitwaghchaure
0d9ab86496
[Fix] Making of production order from so, system not fetched the items from the sales order item if packing list has items and vice versa ( #10453 )
2017-08-21 07:52:49 +05:30
tunde
c7f46218d7
tests and test fixes
...
fixes test case:
make sales invoice using customer that does not have credit_days_based_on 'Last Day Of Next Month'
so that it doesn't conflict with payment term due date
fix test case:
create purchase invoice with new supplier with credit_days_based_on
"Fixed Days" as the default "Last Day of Month" does not apply when
using payment terms
2017-08-20 17:23:27 +01:00
tunde
9df5e004cf
add Payment Terms to Sales Order
2017-08-20 16:52:05 +01:00
tunde
bc174d980c
add Payment Term to Quotation
2017-08-20 16:52:05 +01:00
Faris Ansari
eba50c6860
Merge branch 'pos-refactor' of https://github.com/netchampfaris/erpnext into pos-refactor
2017-08-18 17:00:02 +05:30
Rohit Waghchaure
f03a73466c
Added modal for multi mode payment, provision to add write off and change amount
2017-08-18 12:15:19 +05:30
Faris Ansari
0f3d431476
Update cart ui from cur_frm, Add number pad
2017-08-17 12:56:14 +05:30
Rohit Waghchaure
b1daab4284
Added functional part
2017-08-17 12:56:14 +05:30
Faris Ansari
a0f8687945
Styling for search fields
2017-08-17 12:56:14 +05:30
Faris Ansari
03e7ec29e7
Add clusterize, move customer field to POSCart, get POS profile
2017-08-17 12:56:14 +05:30
Faris Ansari
6e7db034f2
[wip] New POS UI
2017-08-17 12:56:14 +05:30
Faris Ansari
21fc26c2a2
Update cart ui from cur_frm, Add number pad
2017-08-14 18:25:59 +05:30
Rohit Waghchaure
854d335ab1
Added functional part
2017-08-14 11:34:42 +05:30
mbauskar
2fa8af3b02
Merge branch 'master' into develop
2017-08-14 09:31:01 +05:30
Rushabh Mehta
dbb5154f37
Fixes in Order / Quotation ( #10361 )
...
* Additions in Order Page for Sidebar Menu with "Order" page route
* Adjust Columns in order_taxes.html to avoid number breaks for more precisions
* Fields additions in transaction_row.html
* [fix] style for order pages, indicator for quotation etc
* [fix] style for order pages, indicator for quotation etc
* [test] add timeout
2017-08-10 21:06:09 +05:30
Faris Ansari
f7c7ff4aae
Styling for search fields
2017-08-10 18:28:05 +05:30
Faris Ansari
65c4bd6db6
Add clusterize, move customer field to POSCart, get POS profile
2017-08-10 17:17:49 +05:30
Faris Ansari
519cc09979
[wip] New POS UI
2017-08-10 17:17:49 +05:30
rohitwaghchaure
35438b6fc0
[Fix] Opportunity status has not changed after making of quotation against it if items has not added in the opportunity ( #10351 )
2017-08-10 11:15:50 +05:30
mbauskar
42251da131
Merge branch 'master' into develop
2017-08-09 11:17:55 +05:30
Makarand Bauskar
60fcf47f6a
[hotfix] changed the modified date for quotation ( #10337 )
2017-08-09 11:15:18 +05:30
Vishal Dhayagude
135560e170
[UI Test] Multiple UI Test for Quotation ( #10330 )
2017-08-08 18:22:53 +05:30
rohitwaghchaure
468fb97c81
[Fix] Lead address not able to select on the quotation ( #10328 )
2017-08-08 17:27:58 +05:30
Doridel Cahanap
96e52be5f1
[Enhancement] Allow Sidebar Menu record search using text from Item Name of a record ( #10324 )
...
* Search Record in Sidebar Menu Using Item Name for Order Page
* Test Case to create 2 Quotations with different Items
2017-08-08 17:12:50 +05:30
ckosiegbu
1ac6bcba23
Removal of SMS Settings and SMS Parameters from ERPNext ( #10033 )
...
* Removal of SMS Settings and SMS Parameter from ERPNext.
* [DOCS]Documentation for Two Factor Authentication
* [Patch]Point SMS module to frappe core
* Rearrange doc help index.txt to fit
* [DOCS]Update Documentation for Two Factor Authentication
2017-08-08 14:55:30 +05:30
Rushabh Mehta
09d1eaa87b
[minor] standard filters
2017-08-08 12:00:04 +05:30
mbauskar
cce79255fe
resolved merge conflicts
2017-08-04 11:07:49 +05:30
mbauskar
f3be738b68
resolved merge conflicts
2017-08-04 11:07:07 +05:30
Vishal Dhayagude
592add9f0a
[UI Test] Sales Order with Shipping Rule and Pricing Rule Added ( #10270 )
...
* [UI Test] Sales Order with Shipping Rule Added
* [UI Test] Sales Order with Pricing Rule Added
2017-08-04 10:51:08 +05:30
Nabin Hait
af01f5154b
Merge pull request #10251 from rohitwaghchaure/permlevel_1_write_permission
...
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-03 10:45:17 +05:30
Rohit Waghchaure
250e964205
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-02 18:23:39 +05:30
Vishal Dhayagude
f1f1b60a62
[UI Test ] Sales Order with tax and discount ( #10225 )
...
* [new] UI Test for Sales Order
* [fix] Codacy fixed
* Update test_sales_order_with_discount_on_grand_total.js
* Update test_sales_order_with_taxes_and_charges.js
2017-08-02 17:15:47 +05:30
Vishal Dhayagude
316477b422
[UI Tests] All sales order test in tests folders ( #10211 )
...
* [new] Sales order with_discount, multi_uom, delivery_date added
* [fix] All sales order test in tests folder
2017-08-01 17:16:21 +05:30
Makarand Bauskar
317888211a
merged hotfix branch into staging ( #10191 )
...
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )
* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )" (#10159 )
This reverts commit 4d2e782e42
.
* [Fix] Unable to save asset because of float error issue (#10157 )
* bumped to version 8.6.4
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160 )
* Set billing hours to 0 in timesheet #9535 (#10139 )
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
* [Fix] Timesheet Company Issue
* Added delivery date in SO parent form. Fixes #10104 (#10155 )
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
* bumped to version 8.6.5
2017-08-01 11:06:41 +05:30
Vishal Dhayagude
95dfe27bf7
[UI Test] Sales Order with multi currency and tax ( #10189 )
...
* [UI Test] Sales Order with multi currency and tax
* [fix]Codacy fixed
* [fix] tests.txt
2017-07-31 17:29:25 +05:30
Makarand Bauskar
98b52a7245
resolved merge conflicts on develop ( #10185 )
...
* resolved merge conflicts on develop
* [minor] removed the validate_activity
2017-07-31 15:09:52 +05:30
mbauskar
8b6f7914b0
resolved merge conflicts
2017-07-31 12:30:53 +05:30
Nabin Hait
495ef67caa
Added delivery date in SO parent form. Fixes #10104 ( #10155 )
...
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
2017-07-31 11:25:51 +05:30
Vishal Dhayagude
569011fb21
[UI Test] Test for Product Bundle added ( #10158 )
2017-07-28 19:36:50 +05:30
Rushabh Mehta
11a3d51774
[test] test_sales_order.py
2017-07-28 17:11:11 +05:30
Rushabh Mehta
8af33a513b
[fix] test
2017-07-28 15:34:20 +05:30
KanchanChauhan
58c9934452
[fix] company graph based on base currency ( #9950 )
2017-07-26 18:17:11 +05:30
Saurabh
7bdc45eceb
Merge branch 'master' into develop
2017-07-25 18:02:58 +05:30
Saurabh
4c1caa7e98
[hot][fix] updated modified date for sales order
2017-07-25 17:35:14 +05:30
Saurabh
dc6e369172
Merge branch 'master' into develop
2017-07-25 16:42:28 +05:30
Rohit Waghchaure
d62fa84ed9
[Fix] Calendar view for sales order
2017-07-25 15:34:20 +05:30
tundebabzy
65656ec2df
hide salution and gender if company type is Company ( #10040 )
2017-07-24 11:32:26 +05:30
Rushabh Mehta
9d27cf3c62
[tests] refactored ( #9984 )
...
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
mbauskar
0e6933a1e8
resolved merge conflicts
2017-07-20 14:19:47 +05:30
Nabin Hait
9c42161061
Itemised tax breakup fix in docs other than invoice ( #9961 )
...
* Itemised tax breakup fix in docs other than invoice
* Set itemised tax breakup and hsn code in existing docs
2017-07-20 13:32:01 +05:30
rohitwaghchaure
79d6266c7b
[Fix] Unable to create production order from the sales order for the bundle items ( #9976 )
2017-07-20 10:35:51 +05:30
Nabin Hait
8e0f23efc7
Multiple delivery dates in Sales Order and make DN based on selected delivery dates ( #9933 )
...
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates
* Test case and some other minor fixes
* Updated docs for multi delivery date
* removed the trailing whitespace
* removed the trailing whitespace
* removed trailing whitespace
2017-07-20 10:30:59 +05:30
mbauskar
30e03cc4c8
[minor] fixes for TypeError: get_lead_details() takes at least 1 argument (2 given)
2017-07-18 11:45:53 +05:30
Rushabh Mehta
dab1172a18
[refactor] party.js get_party_details ( #9888 )
2017-07-17 15:31:17 +05:30
Nabin Hait
e06526ffff
Add indexes in some transaction doctypes ( #9889 )
2017-07-17 13:28:27 +05:30
KanchanChauhan
319c58266b
Changes Quotes to Quotations in website sidebar because that seems more legit ( #9825 )
2017-07-14 14:30:42 +05:30
Rushabh Mehta
3df2c9421a
[fix] setup wont be called if declared inside setup
2017-07-13 16:11:54 +05:30
Nabin Hait
7312186c76
Set corrected states list in GST State field's options
2017-07-13 10:41:15 +05:30
Nabin Hait
0a32b7a6eb
Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code
2017-07-12 19:21:05 +05:30
rohitwaghchaure
c1a1e62c0d
[Fix] Data not showing in the heatmap of the customer ( #9819 )
2017-07-12 18:57:23 +05:30
Nabin Hait
5a174d61bc
Merge pull request #9754 from creamdory/develop
...
Added Quotation as Standard Sidebar Menu
2017-07-10 14:13:35 +05:30
creamdory
7a2815299e
Added Quotation as Standard Sidebar Menu
2017-07-10 16:09:03 +08:00
mbauskar
3f6a5b2539
[hotfix] fixed the customer address set filter on Installation Note
2017-07-07 15:24:01 +05:30
Rushabh Mehta
43ef4e9047
Added first UI tests ( #9532 )
...
* [wip]
* [tests] wip
* [ui-tests] first-cut
* [minor] remove old tests
2017-07-03 11:53:07 +05:30
Rushabh Mehta
00ae424cac
[regional] ability to send gst reminders to all parties
2017-06-27 17:31:41 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Sagar Vora
6371b53b7e
[fix] get status in calendar view and show green background
2017-06-21 11:58:29 +05:30
mbauskar
de5a11e8fb
[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date
2017-06-19 13:07:51 +05:30
almeidapaulopt
31692a2595
Create a project from a Sales Order ( #9111 )
...
* init commit
* don't get tasks if project name is none
* cleanup
* Update sales_order.js
2017-06-16 15:29:41 +05:30
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Ashwini Save
eed0cee186
Solve issue for while changing status of sales order page not reloading ( #9204 )
...
* Solve issue for while changing status of sales order page not reloading
* Close Sales order issue : code review Changes.
2017-06-13 17:14:06 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Javier Wong
b414f73931
[enhancement] Allow on Submit for Sales Order Customer PO and Customer PO Date ( #9137 )
2017-06-07 20:11:45 +05:30
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
rohitwaghchaure
d2be55b2e0
[Fix] Orders not creating from the POS for new customer if customer name is based on naming series ( #8933 )
...
* [Fix] Orders not creating from the POS for new customer if customer name is based on naming series
* [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile
* added customer name in the search bar of the customer
* search customer by phone number and email id in the POS
2017-06-07 12:04:01 +05:30
Makarand Bauskar
c196d740e5
[minor] added filter for batch no field in purchase transaction ( #9038 )
...
* [minor] added filter for batch no field in purchase transaction
* [minor] filter the batch based on item_code instead of get_batch_no method
* [minor] filter based on item_code for Purchase Invoice with update stock
2017-06-02 17:28:40 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
2d79a641c2
Annual billing amount in party dashboard based on grand total
2017-05-24 16:46:56 +05:30
Nabin Hait
e72c98dafb
On change of item rate, set margin amount on price list rate, instead of margin percentage ( #8988 )
2017-05-24 09:01:44 +05:30
Prateeksha Singh
064530d11f
[minor] remove order_type as setter in multiselect ( #8906 )
2017-05-19 11:09:12 +05:30
Nabin Hait
e4f80a6eaa
Open lost opportunity again if quotation made against it ( #8854 )
2017-05-17 19:41:39 +05:30
Rushabh Mehta
f69ffeb0b4
[fix] if rate is greater than price_list_rate, set margin instead of discount. Fixes frappe/erpnext#6468 ( #8856 )
2017-05-17 19:40:40 +05:30
Sagar Vora
3b04b030eb
Fix cost center not getting pulled in DN and SINV ( #8878 )
...
* Fixes for getting selling cost center instead of company's default cost center.
* fix error in update_item
2017-05-17 19:16:27 +05:30
rohitwaghchaure
654f186f95
[fix] Apply pricing rule on the item based on quantity as per stock uom ( #8792 )
2017-05-16 08:54:29 +05:30
Makarand Bauskar
475d140b5c
[minor] made items table mandatory for quotation ( #8825 )
2017-05-16 08:26:21 +05:30
Faris Ansari
4fcd8a6db3
Fix sales funnel legend position ( Fixes #5073 ) ( #8838 )
2017-05-16 07:40:26 +05:30
Prateeksha Singh
edeb4dc7e0
Multiselect dialog for getting items ( #8583 )
...
* Concatenate docnames and send to mapper
* Multiselect with checkboxes
* set setters as separate filters
* Map filter fields to target_doc
* Get items from quotation (in SO) working
* [major] Set dialog setters for all forms
* Add date field
* Specify non-default date_fields
* [minor] add test_mapper.py
* [minor] remove cur_frm
* [minor][fix] test
* [minor] fix test with make_test_records
2017-05-15 11:32:06 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
Nabin Hait
7228e1af6e
Customer/Supplier Name in sales/purchase analytics ( #8717 )
2017-05-06 12:45:37 +05:30
Nabin Hait
db8f41ba55
Added Payment documents as Quick Links in SO/PO
2017-04-26 14:34:41 +05:30
Nabin Hait
9b20e07431
[fix] currency field precision
2017-04-25 14:09:29 +05:30
Rushabh Mehta
e385b5b97b
[enhance] automatic batch creation, move and split
2017-04-24 10:28:38 +05:30
Nabin Hait
68ae9f3f88
Merge branch 'develop' into allow_on_submit_fix
2017-04-19 21:10:23 +05:30
mbauskar
9e9d242a24
[minor] fixes in test cases and added the test case for multiple uom in selling
2017-04-19 21:05:37 +05:30
Nabin Hait
2de3bf7a0f
Fixed indexes on sales and purchase transactions
2017-04-19 20:58:09 +05:30
Nabin Hait
2704162f5a
Fixes allowd on submit
2017-04-19 16:25:39 +05:30
mbauskar
236f7aac7f
[minor] track changes for transaction documents
2017-04-10 14:48:54 +05:30
Makis Etzoglou
a906b3f11c
add delivery date to print format Fix #8111
2017-04-06 15:47:52 +05:30
Faris Ansari
0d114b4c31
Add image
field to fetch in Customer List
2017-04-03 21:21:50 +05:30
Nabin Hait
620bde7144
Updated modified date to reload sales uom
2017-03-30 19:50:45 +05:30
Nabin Hait
64e9c4abf4
Changed label of hide_tax_id field
2017-03-29 17:39:08 +05:30
Makis Etzoglou
82e6bc45e4
tax_id add to Sales Order, Delivery Note, and Sales Invoice
2017-03-29 17:39:08 +05:30
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
Nabin Hait
56f650f342
Merge branch 'master' into develop
2017-03-15 11:28:07 +05:30
Nabin Hait
3d731df7e3
Field order changed for 'Qty as per Stock UOM'
2017-03-14 17:24:57 +05:30
Rushabh Mehta
aea1c2a1e3
[minor] allow sales order delivery date before order date
2017-03-09 12:46:51 +05:30
Nabin Hait
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Nabin Hait
fe876c0805
Test case fixed for multiple uom in selling
2017-03-06 16:41:13 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
Nabin Hait
57a47a83a0
Merge pull request #7887 from rohitwaghchaure/capacity_planning
...
[Fix] Pull operation on production order, when making from sales order
2017-03-02 14:17:09 +05:30
Nabin Hait
258c8199fb
Merge pull request #7842 from superlack/develop
...
Add Sales Orders to Project costing and billing section
2017-03-01 17:20:23 +05:30
Rohit Waghchaure
2c2ce8c557
[Fix] Pull operation on production order, when making from sales order
2017-02-28 17:12:18 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
superlack
c95ebdb4e4
Update sales_order.py
2017-02-24 12:35:10 -08:00
Nabin Hait
ff5bd680c2
Merge pull request #7840 from rmehta/new-buttons
...
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-24 12:57:13 +05:30
superlack
23e5d40374
Update sales_order.py
2017-02-23 17:43:50 -08:00
Rushabh Mehta
509543752c
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-23 17:03:46 +05:30
Nabin Hait
5278da8901
Merge pull request #7830 from mbauskar/develop
...
[minor] eval conditions for recurring sections and lead fields
2017-02-23 16:54:20 +05:30
mbauskar
d6e409ea92
[minor] hide recurring section if document is in __local state
2017-02-22 18:22:14 +05:30
nick9822
089c5caea5
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-22 17:09:29 +05:30
Kanchan Chauhan
b249a6e6f7
[Fix] Disappearing Dropdown fixed
2017-02-22 15:39:07 +05:30
Nabin Hait
0d66579e83
Merge branch 'develop' into develop
2017-02-20 19:22:03 +05:30
Nabin Hait
cd837ecbac
Merge branch 'develop' into develop
2017-02-20 19:09:20 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
mbauskar
90818080b1
[minor] Configured Auto Close days for Opportunity and Issue
2017-02-17 14:56:00 +05:30
suyashphadtare
049a88cc40
[minor] Show item quantity in warehouse set query
2017-02-10 19:14:43 +05:30
Nabin Hait
2b5fa7647a
Merge pull request #7662 from nick9822/patch-2
...
Sales analytics error after upgrade
2017-02-09 11:45:30 +05:30
nick9822
acb5e9a11b
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-03 12:31:54 +05:30
Rushabh Mehta
6ede4a3809
[enhance] production order from sales order
2017-02-02 17:42:01 +05:30
Rushabh Mehta
587dd90182
[minor] removed customer status
2017-02-01 12:01:24 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
mbauskar
16ce3623bc
[fixes] set lead to Null on delete company transaction & other minor fixes
2017-01-30 10:45:28 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
83f4780f74
[Fixes] Address and Contact fixes
2017-01-30 10:45:28 +05:30
mbauskar
cbc49e2989
[WIP] Address and Contact Fixes
2017-01-30 10:45:28 +05:30
Rushabh Mehta
a0c41b70c4
[fix] tax rule test
2017-01-18 14:14:20 +05:30
Rushabh Mehta
982be9f11b
[tests] fixed for shopping cart
2017-01-17 17:57:38 +05:30
Rushabh Mehta
7385b73449
[fix] test
2017-01-17 17:57:38 +05:30
Rushabh Mehta
592104ef68
[fix] tests
2017-01-17 12:06:53 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
91621639e8
Reload in_standard_filter property
2017-01-06 12:54:16 +05:30
bhupen
107099aac9
you can make quotation from supplier quotation
2017-01-04 17:04:12 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Rushabh Mehta
e60c2c7b7a
[minor] dashboard cleanups
2016-12-27 12:14:37 +05:30
Nabin Hait
1d90b41aea
[fix] Fetch serial nos on change of Warehouse
2016-12-24 10:42:23 +05:30
Nabin Hait
7feef1f158
test case fixed
2016-12-16 16:50:03 +05:30
Nabin Hait
4d76d27dd2
translations
2016-12-16 16:18:45 +05:30
Nabin Hait
3fe99559ef
Fixed negative stock validation message for translation and fixed test cases
2016-12-16 15:30:43 +05:30
Nabin Hait
f49bbe1142
Cleanup of lead and opportunity status updating logic
2016-12-15 11:51:54 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
cb3f44716a
Merge pull request #7139 from rohitwaghchaure/customer_billing_amount_issue
...
[Fix] Currecny symbol for customer's total annual billing, total unpaid amount
2016-12-06 15:42:37 +05:30
Rohit Waghchaure
bcc6ea450a
[fix] test cases for customer credit
2016-12-05 18:32:57 +05:30
Rohit Waghchaure
c857f37f3a
[fix] currecny symbol for customer's total annual billing, total unpaid amount
2016-12-05 17:44:06 +05:30
Nabin Hait
3f1c50a483
Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
...
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-05 16:51:42 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
af0d6378f1
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-02 18:18:04 +05:30
Nabin Hait
a8333be6ad
Merge pull request #7023 from frappe/revert-7012-remove-count-star
...
Revert "[optimize] remove count(*) from queries"
2016-11-24 13:26:38 +05:30
Rushabh Mehta
5dd12cb4f0
Merge branch 'master' into develop
2016-11-22 23:18:29 +05:30
Rushabh Mehta
698c040d21
[hot] fix quotation ( #7039 )
2016-11-22 23:16:40 +05:30
Rushabh Mehta
9872d8cdb5
Revert "[optimize] remove count(*) from queries"
2016-11-21 21:04:47 +05:30
Nabin Hait
d855167b9b
Fixed merge conflict
2016-11-21 19:13:22 +05:30
Rushabh Mehta
5a258cbc2d
[optimize] remove count(*) from queries
2016-11-21 14:57:36 +05:30
KanchanChauhan
49a50fef63
Group same item in SO print ( #6959 )
2016-11-18 13:57:53 +05:30
Rohit Waghchaure
e887e92dd4
Minor fix in delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item
2016-11-18 12:16:22 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
Rohit Waghchaure
6f27f580e1
disable no copy for po number, po date on sales order
2016-11-14 16:08:18 +05:30
Nabin Hait
a469e659c5
Fixed merge conflict
2016-11-08 15:26:27 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Rohit Waghchaure
0ecad33642
cleanup and fixes
2016-11-05 08:09:21 +05:30
Nabin Hait
f5d8dd3b18
Fixed merge conflict
2016-11-04 16:54:53 +05:30
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Nabin Hait
eab38cd4eb
Merge branch 'master' into develop
2016-11-03 15:17:39 +05:30
Rohit Waghchaure
3844d2cc01
Remember last selected value for link field
2016-11-03 14:49:27 +05:30
Rushabh Mehta
e855f53f08
[minor] fix ellipsis style
2016-11-02 07:34:17 +05:30
Rohit Waghchaure
60e5e4ac2d
change fieldtype from float to currency
2016-11-01 16:32:33 +05:30
Nabin Hait
a221f7ec5d
Update test_customer.py
2016-10-24 11:27:56 +05:30
shreyas
f09929ea92
[Fix] Updated test cases to handle negative or zero outstanding amount against customer
2016-10-24 10:35:30 +05:30
shreyas
17f43da2a6
[Test] Added test cases to evaluate customer credit limit
2016-10-24 10:21:05 +05:30
shreyas
e05656963a
[Minor] Do not allow change in credit limit
2016-10-24 10:21:04 +05:30
Nabin Hait
db88bd66b0
Merge branch 'develop' of https://github.com/DigiThinkIT/erpnext into DigiThinkIT-develop
2016-10-20 16:59:40 +05:30
shreyas
edcba51c8b
[Fix] Added check to validate selling price against valuation rate
2016-10-20 15:57:45 +05:30
shreyas
1cfe2d7b45
[Minor] Validate purchase price against selling price
2016-10-20 15:57:45 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Rohit Waghchaure
aa8abfa5b3
Test cases added in sales order to check total projected qty
2016-10-19 15:26:10 +05:30
Rohit Waghchaure
ac9172f6df
[Fix] total projected qty
2016-10-19 15:06:30 +05:30
Nabin Hait
6cb44133c3
Fixed version conflict
2016-10-18 16:18:34 +05:30
Nabin Hait
d5c4a5c802
Hotfix
2016-10-18 16:17:37 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Nabin Hait
f32547a414
Merge pull request #6637 from nabinhait/cost_center_fix
...
Set cost center while creating invoice from SO/PO
2016-10-18 15:18:16 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Nabin Hait
55a8797919
Set cost center while creating invoice from SO/PO
2016-10-18 14:54:17 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
219148d23d
Sales Personwise transaction summary - total row
2016-10-05 12:26:51 +05:30
Felipe Orellana
51082006a9
[FIX] Issue with customer doctype not allowing name series past 10
...
Query used to fetch mast number in series breaks due to sql MAX function handing string and number ordering differently. This causes the last "[name] - 9" series to be picked up as last in the series instead of "[name] - 10". Fix is to cast value to unsigned to MAX handles ordering correctly.
2016-09-23 11:58:11 -04:00
Nabin Hait
6b4eb7f77f
Fixed version conflict
2016-09-23 12:16:31 +05:30
Rohit Waghchaure
bd599b0169
[Fix] Discount copied during making of PO from SO
2016-09-22 11:47:17 +05:30
Rushabh Mehta
559aa3ab7c
[enhance] show customer, supplier billing and outstanding, fixes #6078
2016-09-19 16:04:58 +05:30
Rushabh Mehta
bd15e31ea1
[minor] [enhance] fixes #6222
2016-09-19 15:27:09 +05:30
Rushabh Mehta
e35dbca01b
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
2016-09-19 15:03:57 +05:30
Rushabh Mehta
39b5d39df6
[fix] remove campaign depends on
2016-09-16 15:55:34 +05:30
Rushabh Mehta
59dc0ece9f
[enhance] added Lead Source master, fixes #6231
2016-09-16 11:44:49 +05:30
Kanchan Chauhan
dd96cbd012
Coded column deleted, column added from UI
2016-08-26 14:32:38 +05:30
Rushabh Mehta
fcb793e4dd
[minor] language fields are now links
2016-08-23 16:51:18 +05:30
Rushabh Mehta
b969c2cb60
[minor] budget link in cost center, fixes #6093
2016-08-18 12:36:20 +05:30
Nabin Hait
4da2c81641
Merge pull request #6094 from rmehta/sales-purchase-items
...
[revert] is_sales_item, is_purchase_item back
2016-08-17 11:30:37 +05:30
Rushabh Mehta
d973c1606a
[revert] is_sales_item, is_purchase_item back
2016-08-16 11:32:08 +05:30
Neil Trini Lasrado
987009bf35
Update quotation.json
2016-08-12 16:44:00 +05:30
Neil Trini Lasrado
c917423b01
Fixed typo in quotation, added image feild in Program Enrollment
2016-08-11 18:22:45 +05:30
Rushabh Mehta
6c3ac9587e
[fix] quick entry
2016-07-25 15:03:39 +05:30
Rushabh Mehta
71b6494395
Merge pull request #5845 from KanchanChauhan/quotation-fix
...
[Minor Fix]
2016-07-23 15:16:31 +05:30
Kanchan Chauhan
39c952a3f2
[Minor Fix]
2016-07-23 14:39:01 +05:30
Nabin Hait
e0cc87d2d8
Unlink payment entries on cancellation of Invoice
2016-07-21 18:30:18 +05:30
Rushabh Mehta
5a39d41a0c
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
2016-07-20 22:53:23 +05:30
Rushabh Mehta
39077d4210
[dashboard] for quotation and sales order
2016-07-20 18:55:42 +05:30
Rushabh Mehta
fc8e589295
[fix] party status updating bug, fixes #5794 , #5796
2016-07-20 12:09:27 +05:30
Rushabh Mehta
76b134192f
[fix] grid columns now restricted to 10
2016-07-18 14:30:27 +05:30
Rushabh Mehta
176b63b354
[fix] remove first row on mapping, fixes #5707
2016-07-14 17:43:48 +05:30
Saurabh
6bc7b892c4
[fix] alter fieldtype for is_group from select to check
2016-07-14 14:06:28 +05:30
Rushabh Mehta
391c0efcee
[fix] make grids editable
2016-07-11 13:01:58 +05:30
Rushabh Mehta
7333eb280f
[minor] typo in customer.js
2016-07-07 15:34:01 +05:30
Rushabh Mehta
964ad0fcae
[cleanup] rename "links" to "dashboard"
2016-07-07 14:28:05 +05:30
Kanchan Chauhan
6d76359c31
[WIP] Task statuses updated in website
2016-07-07 12:19:01 +05:30
Kanchan Chauhan
6cb5710ffc
template selection of item disabledin Sales Order
2016-07-06 13:25:44 +05:30
Rohit Waghchaure
a71d9d33af
Rename prevdoc field in purchase order and purchase receipt doctype
2016-07-06 12:13:29 +05:30
Nabin Hait
13093b4b68
Make payment entry aginst order, payment request and patch to rename advance table fields
2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4
Advance Payment Entry adjustment against Invoice
2016-07-04 11:42:04 +05:30
Rushabh Mehta
b33df4afe8
[cleanup] link methods made common
2016-07-04 11:39:25 +05:30
Saurabh
b6d6b8420d
[fix] add filters and child doc name in previous link mapper
2016-06-27 14:48:26 +05:30
Saurabh
2a0b111726
[fix] mark completed docuemts on document flow
2016-06-27 12:28:55 +05:30
Saurabh
8f24ecb173
[fix] set previous doc links for document flow
2016-06-27 12:28:55 +05:30
Saurabh
520fb73676
[fix] authorization rule fix for sales order
2016-06-26 12:09:49 +05:30
Saurabh
a9ba7343c4
[fix] deprecate browser pages for accounts, cost_center, sales , bom, item group
2016-06-25 11:06:14 +05:30
Saurabh
eda1afb4eb
[fixes] comnify tree view
2016-06-25 11:06:13 +05:30
Alec Ruiz-Ramon
fcaaa29a58
Status updater for quotation/lost to lead, quotation lost to oppt, and to set conversion as priority in lead
...
cleanup
squashed
2016-06-09 21:17:57 -04:00
Anand Doshi
51ad436e16
[fix] sales and accounts browser name
2016-06-09 19:37:35 +05:30
Rushabh Mehta
d56306add0
[minor] [fix] quotation cancelled status issue, fixes #5221
2016-06-09 15:56:48 +05:30
Rushabh Mehta
743de9b306
[minor] website field in customer and allow_import for purchase receipt, fixes #5227
2016-06-09 15:11:45 +05:30
Anand Doshi
16e2442278
[cleanup] document flow
2016-06-07 18:55:23 +05:30
Saurabh
7d0e78d399
[fixes] this.frm instead of cur_frm
2016-06-07 17:19:36 +05:30
Saurabh
9df3d0fb8a
[enhance] show module flow on top of document
2016-06-07 17:19:36 +05:30
Nabin Hait
9f98296c9c
minor fix
2016-06-01 16:21:43 +05:30
Rushabh Mehta
aa60fd9037
[fix] new_doc to frappe.new_doc
2016-06-01 11:46:33 +05:30
Nabin Hait
37b5e0c99f
Merge pull request #5399 from nabinhait/report-graph
...
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 17:42:36 +05:30
Nabin Hait
310d64d565
Fixed conflict
2016-05-26 16:10:02 +05:30
Nabin Hait
b46d021f2a
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 15:26:01 +05:30
Rohit Waghchaure
62dbbfba0d
[Fix] during making of material request from sales order, system fetching product bundle items only if so has both product bundle and purchase item
2016-05-20 17:09:29 +05:30
Rushabh Mehta
d0cee1b61b
[fix] minor fixes to pos
2016-05-20 12:54:59 +05:30
Rushabh Mehta
532eedf411
[enhance] more editable grids
2016-05-19 18:22:49 +05:30
Umair Sayyed
90cea14ce3
domanifying EPRNext, fixes #5334
2016-05-13 18:06:17 +05:30
Anand Doshi
a3f20ae9e6
Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup
...
Shopping Cart error messages issue resolved
2016-05-10 17:35:02 +05:30
Kanchan Chauhan
1d79f350bc
Shopping Cart error messages issue resolved
2016-05-10 17:19:47 +05:30
Rohit Waghchaure
6087fe178e
[Enhancement] POS
2016-05-09 23:36:15 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Rushabh Mehta
1aa1c8a9ef
[minor] remove hide_first in forms
2016-04-29 12:20:23 +05:30
Anand Doshi
e3bd78e912
[css] portal
2016-04-22 18:53:21 +05:30
Rushabh Mehta
621283c5c5
[enhancement] stock balance page
2016-04-21 19:00:34 +05:30
Rushabh Mehta
c291ab64a6
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
...
[WIP] No not merge
2016-04-21 11:39:45 +05:30
Rushabh Mehta
02772442b6
[cleanup] added dashboard in project
2016-04-20 18:45:56 +05:30
Kanchan Chauhan
11638ba358
Changes 3
2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952
Changes 2
2016-04-20 16:24:24 +05:30
Rushabh Mehta
0525387328
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
2016-04-18 19:27:46 +05:30
Nabin Hait
14aa9c5320
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
2016-04-18 16:59:47 +05:30
Rushabh Mehta
a305c29b0e
[cleanup] remove is_pro_applicable
2016-04-15 15:03:16 +05:30
Umair Sayyed
72534deea2
removed Is Sales Item and Is Purchase Item
2016-04-15 12:57:00 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9
[enhancement] heatmaps on item and notifications for item
2016-04-14 17:30:53 +05:30
Umair Sayyed
6269f1e3d0
address and contact related fields re-arranged in the sales transactions fixes #5192
2016-04-14 13:07:41 +05:30
Rushabh Mehta
0e2dd859b0
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
2016-04-13 17:22:09 +05:30
Nabin Hait
7132bd3659
[fix] Ignore closed sales order in credit limit validation
2016-04-13 15:19:37 +05:30
Nabin Hait
c2ae1a7375
fixed merge conflict
2016-04-13 11:55:15 +05:30
Rushabh Mehta
8bbca6fa2e
[enhancement] links menu in customer, supplier, item
2016-04-12 19:16:33 +05:30
Nabin Hait
9fef3df6a0
[fix] Fixed pending so items for material request report
2016-04-12 18:46:47 +05:30
Rushabh Mehta
5d0e8dee11
[fix] dashboard for customer, supplier
2016-04-11 17:34:49 +05:30
Rushabh Mehta
6fe962e6ad
[test] fixed circular dependencies
2016-04-08 17:55:11 +05:30
Anand Doshi
2f957f27b0
[fix] apply Tax Rule for lead
2016-04-08 17:43:08 +05:30
Rushabh Mehta
dda1349a2d
[minor] [fix] typo in customer_list.js
2016-04-08 17:22:52 +05:30
Rushabh Mehta
f16f9c569b
[enhancement] add status in customer, supplier
2016-04-08 17:21:00 +05:30
Rushabh Mehta
203cc962f5
[enhancement] Item Selector
2016-04-08 17:21:00 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
Rushabh Mehta
d690094b12
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
2016-04-04 16:57:56 +05:30
Nabin Hait
4f10f15686
[fix] Modified date changed in query report due to project field renaming
2016-04-01 17:59:06 +05:30
Rushabh Mehta
45c6b550f0
[cleanup] assets and made items mandatory in transactions
2016-03-31 15:37:51 +05:30
Rushabh Mehta
652dee45a6
[minor] make margin collapsible
2016-03-29 16:42:13 +05:30
Rushabh Mehta
3117b4b8d6
[fix] minor for quick-entry
2016-03-29 11:53:17 +05:30
Rushabh Mehta
e1b20a0b29
Merge pull request #5044 from rohitwaghchaure/add_margin_feature
...
[Enhancement] Add margin in sales flow.
2016-03-28 18:27:05 +05:30
Rushabh Mehta
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:22:17 +05:30
mbauskar
a52472cf5b
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
2016-03-24 14:07:51 +05:30
mbauskar
75b6fbb6a7
[fix] apply pricing rule added type and rate on ignore pricing rule trigger
2016-03-24 14:07:50 +05:30
mbauskar
b6d19bcfc2
[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item
2016-03-24 14:07:50 +05:30
mbauskar
dcd8b7773d
[fix] calculated rate on py side, added depends on for sales order item
2016-03-24 14:07:50 +05:30
mbauskar
1e428ae400
[fix] function to calculate the revised margin and rate
2016-03-24 14:07:50 +05:30
mbauskar
5e76a1cffa
[fix] added eval for total margin and margin rate field
2016-03-24 14:07:50 +05:30
mbauskar
e40736c105
test case for quotation
2016-03-24 14:07:49 +05:30
mbauskar
5738dd473c
set the target.ignore_pricing_rule to 0
2016-03-24 14:07:49 +05:30
mbauskar
1e9c1640fa
triggers on Margin type and Margin rate fields to calculate the revised Total Margin and Rate
2016-03-24 14:07:49 +05:30
mbauskar
8c8fa17a9b
[new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item
2016-03-24 14:07:48 +05:30
Rushabh Mehta
b07b06dde0
Merge pull request #5011 from neilLasrado/develop
...
[WIP] - Added Project to Manufacturing
2016-03-23 11:45:35 +05:30
Nabin Hait
c8baa01e9c
[fix] Updated modified datetime
2016-03-21 17:20:03 +05:30
Neil Trini Lasrado
11dafa27ba
Added Project to materail request
2016-03-21 12:40:42 +05:30
Nabin Hait
5996b2f1bb
[fix] recurring document logic
2016-03-18 15:19:54 +05:30
rohitwaghchaure
90ff509f6d
[fix]Earlier recurring billing
2016-03-18 10:44:53 +05:30
Saurabh
14d646f636
[fixes] shipping address on purchase flow
2016-03-16 16:23:30 +05:30
Nabin Hait
91a69e4a8d
Merge pull request #4992 from neilLasrado/project-rename
...
Fixed bug while selecting project in sales_invoice, sales_order, deli…
2016-03-16 16:03:18 +05:30
Neil Trini Lasrado
f433a5a124
Fixed bug while selecting project in sales_invoice, sales_order, delivery_note
2016-03-16 16:00:27 +05:30
Nabin Hait
2a5c1138a0
Merge pull request #4944 from rmehta/modules-redesign
...
[redesign] modules
2016-03-16 14:35:11 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Nabin Hait
5fc9552d29
Merge pull request #4980 from rohitwaghchaure/support_week_14_03
...
[fixes]Unable set recurring date in sales order
2016-03-14 19:20:13 +05:30
Nabin Hait
b1f0a7d52e
Merge pull request #4876 from saurabh6790/valuation_rate_on_so
...
[enhancement] get valuation rate and gross profit on sales order item
2016-03-14 19:18:58 +05:30
rohitwaghchaure
c54b805981
[fixes]Unable set recurring date in sales order
2016-03-14 19:03:22 +05:30
Valmik Jangla
98ec1164fc
Removed from Attendance, Upload Attendance, and Sales Order
2016-03-11 13:07:16 +05:30
Valmik Jangla
865d547965
Removed from GL Entry, Opportunity and Quotation
2016-03-11 13:05:20 +05:30
Valmik Jangla
1d797c1688
Removed from Installation Note
2016-03-11 13:05:19 +05:30
Saurabh
3fbf3ce852
[fixes] raise if selects product bundle as sub item in another product bundle.
2016-03-09 15:42:01 +05:30
Saurabh
5ada14b887
[fixes] calculate valuation rate for non stock item
2016-03-09 15:42:01 +05:30
Saurabh
2d7af63351
[fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate
2016-03-09 15:42:00 +05:30
Saurabh
d313553ae3
[enhancement] get valuation rate and gross profit on sales order item
2016-03-09 15:42:00 +05:30
Rushabh Mehta
d1e1c52171
[redesign] modules
2016-03-08 18:07:20 +05:30
Rushabh Mehta
1396b776bc
[fix] print hide for submit_on_creation
2016-03-03 13:57:15 +05:30
Rushabh Mehta
7114b7786e
[fix] print hide for submit_on_create
2016-03-03 13:12:21 +05:30
Rushabh Mehta
5839a8d7f0
[fixes] usability cleanup of recurring document and added explicit submit_on_creation
2016-03-02 17:51:52 +05:30
Rushabh Mehta
aac4dcedc8
[fix] print language and contact_email fields and removed translations
2016-03-02 15:45:09 +05:30
Rushabh Mehta
cbed331047
Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test
...
Multilingual print format test
2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92
[enhancement] Multi-lingual print format
2016-03-01 16:33:08 +05:30
Rushabh Mehta
39a6f804bf
Merge pull request #4871 from ShashaQin/patch-27
...
Improvements about recurring documents
2016-03-01 16:06:33 +05:30
Saurabh
cc7132763f
[fixes] set projected qty in Quotaion Item table
2016-02-26 18:33:53 +05:30
ShashaQin
73c71f9dd5
Update sales_order.json
2016-02-25 11:22:27 +08:00
sbkolate
f9a9754dab
opportunities status fix in Sales Funnel report
...
reference https://discuss.erpnext.com/t/sales-funnel-not-showing-updated-opportunities/10702/4
2016-02-24 19:25:35 +05:30
Anand Doshi
acd1bcffde
[fix] changed field type to Code
2016-02-24 12:38:08 +05:30
Nabin Hait
57b30430e4
Merge pull request #4695 from neilLasrado/develop
...
Material Request of type Manufcture
2016-02-24 12:30:53 +05:30
Nabin Hait
d2d261dc87
Merge pull request #4854 from patilsangram/develop
...
Removed Stop Button from SO and PO
2016-02-24 11:21:17 +05:30
patilsangram
a812d67837
[fixes]
2016-02-23 19:04:29 +05:30
Neil Trini Lasrado
f79760ce2d
Mumtiple fixes
2016-02-23 18:35:45 +05:30
Neil Trini Lasrado
abd9248ba6
Rename sales_order_no to sales_order in Material Request Item
2016-02-23 18:35:43 +05:30
Saurabh
ac33724656
[fixes] removed no copy for warehouse field
2016-02-23 18:18:04 +05:30
Saurabh
3724448cd3
[fixes] typo-fixes and fix in balance qty fetching
2016-02-23 18:18:04 +05:30
Saurabh
dcb72c6be7
[enhance] Displaying stock balance while creating quotation
2016-02-23 18:18:04 +05:30
Nabin Hait
8a59c33e2f
[fix] Sales Person target variance report: based on lft and rgt of item group
2016-02-23 15:23:24 +05:30
saurabh
fb71f32ebf
conflicts resolved
2016-02-23 02:26:37 +05:30
saurabh
2e2dd0fb42
Documentation of multilingual print format and minor fixes
2016-02-23 02:17:04 +05:30
saurabh
c422c23813
import method to load all languages in language field on customer form
2016-02-23 02:17:03 +05:30
saurabh
65820ed013
added new field language for users
2016-02-23 02:17:03 +05:30
patilsangram
bf2b511988
[Removed Stop Button from SO and PO]
2016-02-22 16:24:23 +05:30
saurabh
755fefbfd4
import method to load all languages in language field on customer form
2016-02-19 11:46:29 +05:30
saurabh
a1c3ea2f86
added new field language for users
2016-02-19 11:46:28 +05:30
Rushabh Mehta
3aa14f54b7
[fix] installation note item description to Text Editor
2016-02-10 11:56:05 +05:30
Rushabh Mehta
7f3983a3d6
Merge pull request #4769 from rmehta/pricing-rule-on-variant
...
[fix] pricing rule for variant, if rule for template available, use it
2016-02-09 11:20:00 +05:30
Rushabh Mehta
10663ab37f
Merge pull request #4762 from nabinhait/multifixes3
...
Advance adjustment in invoice cannot be greater than grand total
2016-02-08 18:53:27 +05:30
Rushabh Mehta
faf9b589c4
[fix] pricing rule for variant, if rule for template available, use it
2016-02-08 18:49:27 +05:30
Nabin Hait
4c6af87ad0
[fix] Read permission to All for permlevel 1 fields
2016-02-08 16:56:19 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Nabin Hait
289ffb788c
[fix] Advance adjustment in invoice cannot be greater than grand total
2016-02-08 11:07:00 +05:30
ShashaQin
e7dccca782
Update item_wise_sales_history.json
2016-02-04 16:44:18 +08:00
Nabin Hait
d5fda57297
[fix] Ignore permissions and made Customer warehouse field hidden in selling cycle
2016-02-01 15:55:09 +05:30
shreyas
1a943151d7
[Refactor/Cleanup] Cleaned debug print statement
...
Refactored code to use format() instead of string formatting using %s
2016-01-29 15:41:45 +05:30
shreyas
c761f1b0a1
[Minor] Cleanup
2016-01-29 15:41:44 +05:30
shreyas
e970ddcee9
[Fix]
...
1. Sales Person wise transaction report
2. Sales Person wise target variance report
3. Sales order trend report generation for selection in group by feild
2016-01-29 15:41:44 +05:30
shreyas
51db2ba22a
[Partial]Fixed Sales person target variance report
2016-01-29 15:41:44 +05:30
shreyas
cbc18ffdbf
[Partial] Fixed the issue for Territory Item Group Variance report
2016-01-29 15:41:44 +05:30
Anand Doshi
9c24bec654
Merge branch 'nabinhait-mc_fix_5' into develop
2016-01-29 12:16:35 +05:30
Nabin Hait
5bedd649df
Merge pull request #4691 from anandpdoshi/cleanup/remove-is-service-item
...
[cleanup] Removed 'Is Service Item' checkbox and filters
2016-01-29 11:10:54 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
Anand Doshi
01de945388
[cleanup] Removed 'Is Service Item' checkbox and filters
...
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
2016-01-26 16:22:51 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
5dcb40bc96
Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy
...
[fix] obey no_copy while creating recurring documents
2016-01-25 17:27:04 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
Rushabh Mehta
e1a1c8ac31
[minor] clean up message if no Customer from Quotation > Sales Order, fixes #3854
2016-01-25 13:08:32 +05:30
Nabin Hait
9824e22ce1
[fix] Price list rate applied via set_missing_values
2016-01-19 16:48:32 +05:30
Nabin Hait
34d2822483
Fixes in get_item_details and test cases
2016-01-19 16:48:32 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Saurabh
69f9975748
[fixes] show link to visit cart after adding item, hide cart button on cart view
2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
2016-01-12 14:09:52 +05:30
Saurabh
276d3e60bd
[enhance] pay via cart
2016-01-12 14:09:51 +05:30
Saurabh
2ffea6ba94
[document & fixes] document and test case rewrite
2016-01-12 14:09:51 +05:30
Saurabh
3ba22676bf
[fixes] Create and manage payment request
2016-01-12 14:09:50 +05:30
Saurabh
db7a56b453
[fixes] fieldtype, message fixes on Payment Request
2016-01-12 14:09:50 +05:30
Saurabh
cb98d9ec5f
[fixes] print format listing
2016-01-12 14:09:50 +05:30
Saurabh
b109ee96de
[fixes] Base structure for Payment Request
2016-01-12 14:09:49 +05:30
Saurabh
eba7aa496c
[enhace] basic structure for payment gateway
2016-01-12 14:09:49 +05:30
Rushabh Mehta
1ee5ae1e25
[fix] [minor] don't show cancelled sales orders
2016-01-06 16:47:18 +05:30
Anand Doshi
03e7e581d8
[minor] removed Communication table
2016-01-06 13:23:45 +05:30
Anand Doshi
06a82d4e1f
Merge pull request #4574 from rmehta/translations
...
Translation fixes
2016-01-05 18:41:18 +05:30
Anand Doshi
f9eff57531
[fix] credit limit
2016-01-05 16:00:33 +05:30
Rushabh Mehta
5760b79747
[translations] fixes #4533
2016-01-04 15:57:01 +05:30
Rushabh Mehta
eb961370ff
[translations] fixes #4532
2016-01-04 15:48:37 +05:30
Nabin Hait
b6b56453e1
[fix] Get defaults based on doctype or fieldname
2015-12-23 16:37:06 +05:30
Rushabh Mehta
1f63747916
[minor] [fix] add child in sales browser
2015-12-23 16:23:37 +05:30
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Anand Doshi
2da81732eb
Merge pull request #4500 from rmehta/fixes-to-tree
...
[fix] rename tree item fixes #2524
2015-12-15 14:38:26 +05:30
Rushabh Mehta
e8ab320028
[fix] rename tree item fixes #2524
2015-12-15 12:06:37 +05:30
Nabin Hait
204af3ce90
[fix] Ignore user permission in target warehouse in SO
2015-12-11 15:01:02 +05:30
Saurabh
f6891975d5
[fixes] pull customer details only if drop shipping is marked
2015-12-09 15:04:12 +05:30
Nabin Hait
694373d022
Fixed conflict
2015-12-08 15:30:15 +05:30
Saurabh
70ed6ede5c
[fixes] patch to update delivery status for drop ship item
2015-12-08 14:48:19 +05:30
Saurabh
01ca354d52
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
2015-12-08 14:03:09 +05:30
Nabin Hait
a974ab3dc5
[fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier
2015-12-08 12:56:14 +05:30
Saurabh
4f39fd243e
[fixes] recreate print format, shipping address on po for drop ship, validate update stock
2015-12-06 10:09:06 +05:30
Nabin Hait
d793fc9446
[fix] Mapping allowed for negative quantity
2015-12-01 17:28:12 +05:30
Anand Doshi
ddad05dab3
[fix] Customer de-duplication sql
2015-11-20 17:29:40 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Saurabh
b65c69f9eb
[fixes] drop ship test case fixes
2015-11-18 17:39:26 +05:30
Saurabh
2e292060c5
[fix] Reserved and ordered qty fix for drop ship orders
2015-11-18 17:39:26 +05:30
Saurabh
55222a5b82
[fixes] test case fixes
2015-11-18 17:39:26 +05:30
Anand Doshi
da79740cdf
[fix] injection
2015-11-17 18:27:50 +05:30
Anand Doshi
cea5479f4d
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
2015-11-12 18:39:57 +05:30
Anand Doshi
4e72ef1421
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
2015-11-09 13:01:49 +05:30
Rushabh Mehta
4268b0092a
[minor] don't show po / mr buttons if delivered
2015-11-06 16:52:18 +05:30
Rushabh Mehta
97426776bd
Merge pull request #4281 from nabinhait/address_fix
...
[fix] Clear addressed and contacts on a new form
2015-11-06 11:02:31 +05:30
Saurabh
d805bd7daf
[fixes] update delivery status
2015-11-04 16:40:09 +05:30
Rushabh Mehta
ac53f2dbb1
[test] [fix]
2015-11-04 15:47:08 +05:30
Rushabh Mehta
20a7d820ab
[fix] shot ledger buttons for closed DN / PR
2015-11-04 15:31:41 +05:30
Rushabh Mehta
d48c2394e8
[cleanup] drop ship testing & cleanup
2015-11-04 15:24:04 +05:30
Saurabh
b7f0a4961e
- no delivery / reserve warehouse in drop ship
...
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
2015-11-04 12:03:54 +05:30
Rushabh Mehta
9c044eefff
[cleanup] re-arrange drop ship field
2015-11-03 18:28:37 +05:30
Rushabh Mehta
5951692db0
[fix] cleanup stop-resume code
2015-11-03 18:20:39 +05:30
Rushabh Mehta
b1d8979a59
Merge pull request #4179 from saurabh6790/drop-shipping
...
Drop shipping
2015-11-02 15:43:48 +05:30
Rushabh Mehta
ec2d0030b7
Merge pull request #4265 from nabinhait/jv_fix
...
[cleanup] Make Payment Entry from Order/Invoice
2015-11-02 15:23:01 +05:30
Saurabh
7cd0ba70d9
[fixes] typo error
2015-11-02 15:18:23 +05:30
Nabin Hait
66340f9894
[cleanup] Make Payment Entry from Order/Invoice
2015-11-02 14:40:47 +05:30
Saurabh
a8a91cca16
[feature] Close feature for Purchase Receipt and Delivery Note
2015-11-02 12:57:08 +05:30
Nabin Hait
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +05:30
Saurabh
6956eee790
[fixes] test case and code rewrite
2015-10-29 19:43:35 +05:30
Saurabh
2e65aadb1e
[fixes] reload doc after status update and supplier address fetching
2015-10-29 19:43:35 +05:30
Saurabh
653cffec1e
[change_log and fixes] set print hide, add change_log
2015-10-29 19:43:35 +05:30
Saurabh
cc8f1afa56
[fixes] test case fixes for drop shipping
2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32
[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
2015-10-29 19:43:35 +05:30
Saurabh
f857d81f35
[fixes]test case to check updated delivered qty
2015-10-29 19:43:34 +05:30
Saurabh
6d64fe378d
[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1
2015-10-29 19:43:34 +05:30
Saurabh
b0ab93f779
[fixes] typo error
2015-10-29 19:43:34 +05:30
Saurabh
df1c1a573f
[fixes] test case for per_ordered
2015-10-29 19:43:34 +05:30
Saurabh
a1f2aec918
[fixes] check ordered and reserved qrt, check closed status for so and po
2015-10-29 19:43:34 +05:30
Saurabh
d8930a776d
[fixes] test case import fix
2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174
[fixes] reviwe fixes
2015-10-29 19:43:33 +05:30
Saurabh
edba048c14
[fixes] set is_stock_item for test items
2015-10-29 19:43:33 +05:30
Saurabh
5e0b0b4b97
[enhance] make PO from SO if supplier is specified
2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e
[fixes] filter on supplier list for DropShip, checking closed status
2015-10-29 19:43:33 +05:30
Saurabh
99543f72d8
[fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list
2015-10-29 19:43:32 +05:30
Saurabh
1a9646739a
[fixes][rename-field-name] drop_ship to is_drop_ship
2015-10-29 19:43:32 +05:30
Saurabh
bd65cb8817
[fixes] field rename and test case for drop ship
2015-10-29 19:43:32 +05:30
Saurabh
98b287565a
[enhance] close purchase order
2015-10-29 19:43:32 +05:30
Saurabh
c6dbe70256
[Fixes] Drop Shipping
2015-10-29 19:43:32 +05:30
Saurabh
556536615e
[minor fix] Status fix in listview
2015-10-29 19:43:31 +05:30
Saurabh
8bd96f1c08
[Test Case] Test case to check drop shipping
2015-10-29 19:43:31 +05:30
Saurabh
5b7e9a1c94
[minor fixes]
2015-10-29 19:43:31 +05:30
Saurabh
c306b21415
[merge fixes]
2015-10-29 19:43:31 +05:30
Nabin Hait
398c83afa5
[fix] For Serial No Status
2015-10-22 15:11:44 +05:30
Neil Trini Lasrado
d4357e80d7
Fixed Test Cases
2015-10-20 16:21:02 +05:30
Anand Doshi
1d093a4039
[fix] change attach fields to small text
2015-10-19 12:56:29 +05:30
Saurabh
c0cee82727
[small fixes] frozen customer testcase
2015-10-14 18:03:07 +05:30
Saurabh
4c53931363
[fixes and test case] test case to avoid duplicate customer name exection
2015-10-14 18:03:07 +05:30
Saurabh
53f7e6281c
[fix] Duplicate Customer Name Error
2015-10-14 18:03:07 +05:30
Rushabh Mehta
ee6862b277
[fix] VARCHAR lengths as 140
2015-10-14 17:28:35 +05:30
Rushabh Mehta
80d2a55342
[enhancement] add variants in website
2015-10-14 16:16:00 +05:30
Anand Doshi
71ebad5668
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
2015-10-14 16:13:49 +05:30
Nabin Hait
c865f229fb
Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status
2015-10-13 15:46:42 +05:30
Rushabh Mehta
fd294eb981
Merge pull request #4154 from rmehta/sales-analytics-fix
...
[minor] [fix] Use customer_name in Sales Analytics
2015-10-12 18:32:39 +05:30
Rushabh Mehta
a7099eaa8d
[minor] [fix] Use customer_name in Sales Analytics
2015-10-12 16:22:10 +05:30
Nabin Hait
51e980dd2c
[fix] Multiple minor fixes
2015-10-10 18:10:05 +05:30
Nabin Hait
bcd655a985
Merge pull request #4109 from rmehta/fix-sales-purchase-order-status
...
[fix] sales & purchase order status
2015-10-07 11:34:30 +05:30
Nabin Hait
5c66fb7631
Merge pull request #4130 from nabinhait/reports
...
[fix][report] Left join used in pending reports
2015-10-07 11:15:36 +05:30
Nabin Hait
54ecc8ebba
minor fix in credit limit
2015-10-06 14:28:41 +05:30
Nabin Hait
f4edaef481
[fix][report] Left join used in pending reports
2015-10-06 12:48:04 +05:30
Rushabh Mehta
d10ba853e6
[fix] sales & purchase order status
2015-10-02 17:16:51 +05:30
Anand Doshi
673887455f
[fix] Show Contribution (%) in Sales Team table in Customer Form
2015-10-01 11:21:25 +05:30
Anand Doshi
21f6ea6f7e
[hotfix] remove allow on submit from item tables
2015-09-30 18:45:29 +05:30
Anand Doshi
4945b94950
[fix] added validation to match account currency with existing gle and test case
2015-09-30 16:41:15 +05:30
Anand Doshi
248c867a2c
[minor] removed test case for party multi-currency validation, since party multi-currency is now based on account
2015-09-30 15:11:13 +05:30
Anand Doshi
da98ab6f3c
[fix] Only 1 account per company for a party
2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 15:11:12 +05:30
Rushabh Mehta
b5ff9421e1
[optimize] customer outstanding query
2015-09-25 12:25:12 +05:30
Anand Doshi
c6e4b5978d
[fix] Sales Order - get_query fix
2015-09-24 11:32:54 +05:30
Anand Doshi
e2d46d0474
[fix] Allow Sales Team to be added/updated after submit
2015-09-23 19:26:29 +05:30
Anand Doshi
b07b0a9e54
[fix] Sales Order indicators for Maintenance
2015-09-23 15:52:11 +05:30
Anand Doshi
b6ec680c46
[fix] round percentages in get_indicator
2015-09-22 16:36:20 +05:30
Anand Doshi
0332f83bc2
[fix] customer naming series validation and patch to fix missing default taxes and lead
2015-09-17 19:01:48 +05:30
Anand Doshi
5532a14938
[hotfix] create customer contact and address from lead only on create
2015-09-17 18:27:56 +05:30
Nabin Hait
77ca80217c
[fix] Account Currency and Balance fixed in chart of accounts #4019
2015-09-17 14:43:33 +05:30
Nabin Hait
87c2d1d634
[fix] Dashboard info in accounting currency for Customer and Supplier #4017
2015-09-17 14:16:01 +05:30
Anand Doshi
86102064a5
[fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method
2015-09-15 11:50:30 +05:30
Anand Doshi
dbe623b167
[fix] Use User Permission value as default only if the document type is Setup
2015-09-14 13:08:53 +05:30
Anand Doshi
71e51c179c
[fix] changed modified for multi-currency sync
2015-09-11 16:55:11 +05:30
Anand Doshi
5d9cfc76cd
Don't copy title field in Duplicate
2015-09-11 15:35:26 +05:30
Rushabh Mehta
d461d462aa
[minor] rename notified_modifed > notified_update. Merge with #1296
2015-09-11 15:34:41 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Anand Doshi
9d5b84e78a
Merge pull request #3996 from nabinhait/fix6
...
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-09 15:11:12 +05:30
Nabin Hait
cd103c05d6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408
[minor] Unset Apply User Permissions in default permissions
2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed
Fixed conflict
2015-09-08 18:09:03 +05:30
Anand Doshi
43888546f6
Merge pull request #3968 from rmehta/task-not-mandatory
...
[minor] task not mandatory for Time Log and Expense Claim #3904
2015-09-08 15:47:11 +05:30
Nabin Hait
2249eea59f
Fixed conflict
2015-09-08 12:55:21 +05:30
Anand Doshi
cba99743a4
[fix] Customer match condition in autosuggest
2015-09-07 14:51:30 +05:30
Rushabh Mehta
be9edae961
[fixes] to task test case and fix tree ui for mobile
2015-09-04 16:18:17 +05:30
Nabin Hait
11a746d363
Fixed conflict
2015-09-03 16:04:11 +05:30
Nabin Hait
1609933748
Test cases for multi currency
2015-09-03 16:03:07 +05:30
Nabin Hait
98096771c2
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
2015-09-03 10:28:08 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Rushabh Mehta
8f1391dc96
[enhancement] calendar for sales order and other related fixes #3542
2015-08-31 12:42:45 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Anand Doshi
3d9d2d1dd1
Exported all doctypes
2015-08-27 17:04:39 +05:30
Anand Doshi
57a51351d3
[fix] Changed more section label to 'More Information'
2015-08-27 17:04:06 +05:30
Anand Doshi
77a2107973
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
2015-08-27 17:04:05 +05:30
Rushabh Mehta
c5346c99de
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-27 17:03:37 +05:30
Nabin Hait
78be566428
minor fix
2015-08-27 16:27:44 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Nabin Hait
2091f0c97e
Checked out json files from upstream
2015-08-27 14:35:17 +05:30
Anand Doshi
282e4947fa
[fix] Changed more section label to 'More Information'
2015-08-27 13:11:46 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
Anand Doshi
b99c180466
Merge branch 'rmehta-validation-settings' into develop
2015-08-27 12:22:06 +05:30
Anand Doshi
6cf193d432
[minor] In Sales Order, changed label from PO No. to Customer's Purchase Order
2015-08-27 12:21:17 +05:30
Nabin Hait
35a5c87cbf
[fix] Clear notifications for Sales / Purchase Order on stop/unstop
2015-08-27 12:06:11 +05:30
Rushabh Mehta
740db53b86
[fix] returned_qty reapply and change-log
2015-08-27 12:00:16 +05:30
Anand Doshi
69b6195d3b
Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings
...
Conflicts:
erpnext/stock/doctype/delivery_note/delivery_note.py
2015-08-27 11:39:20 +05:30
Rushabh Mehta
f7800c053b
[layout cleanup] in Quotation, Sales Order, Delivery Note
2015-08-26 18:53:37 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +05:30
Anand Doshi
fe13bfed44
Fixes to Return Improvements pull request
...
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
2015-08-25 19:07:04 +05:30
Rushabh Mehta
3c107cdbf8
[enhancement] allow user to set warning for multiple items and sales order against multiple purchase orders #3699
2015-08-25 14:26:42 +05:30
Nabin Hait
3f321ebfde
utilities/repost_stock file renamed to stock/stock_balance
2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9
Update order reference in return entries and repost reserved / ordered qty
2015-08-25 14:11:13 +05:30
Nabin Hait
1f94fa25a8
Update delivered / ordered qty in sales/purchase order from return entry
...
Reserved Qty logic cleaned up
2015-08-25 14:11:12 +05:30
Rushabh Mehta
12fb0d998f
[fix] Customer Address and Contact report
2015-08-24 12:21:04 +05:30
Nabin Hait
c561a499d7
Multi currency GL entry fixes
2015-08-21 14:31:47 +05:30
Nabin Hait
6aea1c0da5
Currency validation in gl entry
2015-08-21 14:31:46 +05:30
Rushabh Mehta
aeab6c559c
[enhancement] multi-currency, added fields #1002
2015-08-21 14:31:46 +05:30
Rushabh Mehta
81e9d4e8f5
[fix] changed text > text editor for description fields in tables
2015-08-19 13:00:03 +05:30
Rushabh Mehta
1d1f1b06d9
[minor] notify stop/unstop
2015-08-18 17:26:50 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Anand Doshi
7d45929872
Merge pull request #3829 from dottenbr/customer-taxid
...
Tax ID added and Customer Details description updated
2015-08-11 12:33:32 +05:30
Dominik
d1416542a0
Tax ID added and Customer Details description updated
...
Tax ID is a relatively generic descriptor for VAT (Value Added Tax) or any other countrie's tax identification system and should be required by most users of an ERP system. Since this removes the necessity to put the VAT into the Customer Description (not the ideal place to begin with) the description was updated and slimmed down.
2015-08-08 00:05:38 +05:30
Rushabh Mehta
48cccca9af
[minor] add close button in opportunity and project links in customer
2015-08-06 15:37:01 +05:30
Rushabh Mehta
5bd394278d
[fix] test-case, warehouse mandatory for mix type product bundle
2015-08-04 14:49:25 +05:30
Rushabh Mehta
a208c56813
[enhancement] auto insert item price if missing, #3533
2015-08-04 14:48:52 +05:30
Rushabh Mehta
862a2eb975
[enhancement] make service type product bundle:
2015-08-04 14:47:45 +05:30
Nabin Hait
d46fb5eb8c
Merge pull request #3743 from rmehta/indicator-fix
...
[fix] indicators for sales order, purchase order #3736
2015-07-29 15:53:44 +05:30
Rushabh Mehta
2f3b097d63
[fix] indicators for sales order, purchase order #3736
2015-07-29 13:08:27 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Neil Trini Lasrado
cc7cb2a70a
Allowed frozen_accounts_modifier to create records against frozen customer/supplier
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
79bf233734
Test Cases added to check if customer is frozen
2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
3698b84d7c
Typo fixes in Supplier and Customer Document
2015-07-28 12:17:02 +05:30
Neil Trini Lasrado
3fbbb71afc
Added ability to freeze Customer/Supplier
2015-07-28 12:17:02 +05:30
Anand Doshi
8e8e9c61ca
[minor] Show description in Sales Order
2015-07-28 10:46:14 +05:30
Nabin Hait
3cf67a462b
Cleanup and test cases for serialized item
2015-07-24 13:26:54 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Neil Trini Lasrado
05d8174696
Fetch items from Packing List if Exists in Sales Order while raising Material Request against SO
2015-07-22 16:31:34 +05:30
Anand Doshi
285135da8e
[ui] Remove 'Stopped' alert banner in Sales Order
2015-07-17 15:14:40 +05:30
Rushabh Mehta
94157334a7
[rename] Material User > Stock User
2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
1cd049d824
Sales BOM to Product Bundle rename changes
2015-07-13 14:17:42 +05:30
Neil Trini Lasrado
09a66c4201
Fixed issue with Customer Contacts in Transaction Documents
2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Nabin Hait
6e38e917eb
Reserved warehouse should not be validated on cancellation of sales order
2015-07-13 11:36:36 +05:30
Nabin Hait
4770a1abb5
Customer's credit days based on fixed days / last day of the next month
2015-07-09 16:35:53 +05:30
Neil Trini Lasrado
ebb60f5dbc
Fixed issues in Expired Batches while making Stock Entry
2015-07-08 15:24:02 +05:30
Nabin Hait
73b7efd61d
Merge pull request #3583 from rmehta/quotation-list-fix
...
[fix] quotation list #3492
2015-07-06 14:31:23 +05:30
Rushabh Mehta
56912791e2
[fix] quotation list #3492
2015-07-06 11:14:31 +05:30
Rushabh Mehta
85e6f5d04e
[fix] [minor] fix customer_name, supplier_name labels
2015-07-03 12:59:08 +05:30
Rushabh Mehta
5105f909d6
[fix] show item description in form grid based on in_list_view
2015-07-02 15:09:18 +05:30
Nabin Hait
56bc215855
Merge pull request #3505 from neilLasrado/print-format
...
Recurring Invoice Print Format
2015-06-29 18:54:24 +05:30
Neil Trini Lasrado
a1f1edc786
Typo fixes in Sales Person
2015-06-29 16:04:12 +05:30
Neil Trini Lasrado
e2d8dd0663
added recurring print format to sales/purchase invoice and order
2015-06-29 12:50:41 +05:30
Nabin Hait
7c5ba957ac
Label changed for discount amount in base currency
2015-06-15 15:47:07 +05:30
Neil Trini Lasrado
587bd144d5
Added Customers Not Buying Since Long Time against Sales Invoice
2015-06-11 18:36:52 +05:30
Neil Trini Lasrado
d015195617
fixes in barcode
2015-06-09 15:21:50 +05:30
Nabin Hait
c87595b2da
show item description in item grid view if marked for 'In List View'
2015-06-03 11:24:37 +05:30
Nabin Hait
42f2674cba
dynamic link in quotation item
2015-06-03 11:24:37 +05:30
Rushabh Mehta
d3fe7ec858
[cleanup] customer not buying since long time report
2015-06-02 12:21:17 +05:30
Rushabh Mehta
99b18224f5
[minor] remove order_by in listview, let user customize
2015-05-29 12:48:24 +05:30
Nabin Hait
e7b37af525
Merge pull request #3353 from rmehta/barcode-fix
...
[fix] clear barcode from table, fixes #3320
2015-05-28 11:07:16 +05:30
Nabin Hait
10026ea85c
Merge pull request #3354 from rmehta/discount-field-relabel
...
[cleanup] rename discount and reserver warehouse #3325
2015-05-28 11:02:51 +05:30
Rushabh Mehta
69fb13f229
[cleanup] rename discount and reserver warehouse #3325
2015-05-27 12:20:07 +05:30
Rushabh Mehta
c2acfc9828
[fix] clear barcode from table, fixes #3320
2015-05-27 12:01:03 +05:30
Anand Doshi
fb4e496b54
[fix] target variance sql
2015-05-26 18:15:55 -04:00
Nabin Hait
1f5b21673c
minor fix in report
2015-05-26 12:15:39 +05:30
Nabin Hait
2c6705ef83
Merge pull request #3322 from nabinhait/test_case
...
Test case
2015-05-25 16:19:03 +05:30
Nabin Hait
c4fa74f51d
sales partner field added in sms center
2015-05-25 15:17:29 +05:30
Nabin Hait
b62068f784
removed debug
2015-05-25 14:46:12 +05:30
Nabin Hait
43539673cc
[fix] sales person wise transaction summary
2015-05-25 14:13:03 +05:30
Nabin Hait
fd4bcd855b
test case fixes
2015-05-22 16:55:55 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Neil Trini Lasrado
68a6d61589
filter added for closed oppurtunity
2015-05-20 19:01:37 +05:30
Neil Trini Lasrado
c55edf18ad
fixes in quotation - from opportunity
2015-05-20 18:51:38 +05:30
Rushabh Mehta
476019a930
[fix] throw name error for duplicate group
2015-05-19 13:03:01 +05:30
Rushabh Mehta
4a3c805049
[fix] sms settings, fixes #3276
2015-05-19 11:10:12 +05:30
Rushabh Mehta
632fb3879e
[fix] sms center, fixes #3274
2015-05-19 11:00:10 +05:30
Rushabh Mehta
770c258406
[test-fix] case
2015-05-18 12:43:46 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Nabin Hait
f78283fbff
customer and supplier dashboard info
2015-05-15 16:58:51 +05:30
Rushabh Mehta
e2e1471f4d
[fix] fix breadcrumbs for sales browser fixes #3240
2015-05-15 14:05:10 +05:30
Nabin Hait
90fc19ed9a
Item image in print view
2015-05-14 12:32:26 +05:30
Nabin Hait
2f243f4d08
Merge pull request #3242 from neilLasrado/crm
...
view leads button added to campaign
2015-05-13 19:34:36 +05:30
Rushabh Mehta
92015a1268
[fix] [minor] escape in report
2015-05-12 11:32:25 +05:30
Neil Trini Lasrado
6c85479e4f
view leads button added to campaign
2015-05-11 17:56:36 +05:30
Rushabh Mehta
ab1ed013b3
[hot] taxes
2015-05-08 11:09:25 +05:30
Rushabh Mehta
55dc66ffcc
[fix] index for sales order item
2015-05-07 18:16:49 +05:30
Rushabh Mehta
009378e187
[rename]
2015-05-06 22:59:00 +05:30
Rushabh Mehta
bcdea3ea51
[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template
2015-05-06 18:45:47 +05:30
Rushabh Mehta
5dbf8a7418
[cleanup] frappe.get_user
2015-05-01 11:51:26 +05:30
Nabin Hait
aa03a8e3a2
Migrate customized precision for newly created total fields
2015-04-30 16:13:47 +05:30
Nabin Hait
042f86e555
advance paid should not be copied and patch to fix affected records
2015-04-28 13:00:23 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Nabin Hait
2029ea9abf
toggle editable price list rate
2015-04-16 17:55:35 +05:30
Nabin Hait
c3daa91c8a
Reset no-copy fields for recurring docs and patch to fix
2015-04-16 13:13:18 +05:30
Pratik Vyas
2437d4cce2
Fix #3046 Customer Acquisition and Loyalty repor
2015-04-10 12:35:43 +05:30
Nabin Hait
4642d0697e
fixed conflict
2015-04-09 11:42:24 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Rushabh Mehta
7c32770a69
move opportunity item to CRM
2015-04-02 22:06:36 +05:30
Rushabh Mehta
918ddf2537
[task] open, close from list:
2015-04-01 15:43:14 +05:30
Rushabh Mehta
aefc01372f
[listview] issue: open, close | so, po: stop, unstop
2015-03-31 13:39:42 +05:30
Sambhaji Kolate
a4fa96cc79
some fix in batch related cleanup
2015-03-30 16:04:55 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Nabin Hait
da5cfb1630
Exchange rate upto 9 decimals
2015-03-23 14:51:45 +05:30
Nabin Hait
ca7e778f82
modified date updated
2015-03-23 14:17:59 +05:30
Nabin Hait
2ed71bac20
Batch related cleanup
2015-03-20 15:06:30 +05:30
Nabin Hait
60aee54c6c
currency in test records
2015-03-18 16:06:13 +05:30
Nabin Hait
87ee502dfd
Merge pull request #2949 from sbktechnology/develop
...
update get_batch_no query to sort batch with expiry date
2015-03-18 14:29:13 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Nabin Hait
f2791f8898
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:01:09 +05:30
Anand Doshi
ead48094b6
manipulate diff only if diff <= 0.02
2015-03-13 18:59:01 +05:30
Anand Doshi
d6822ddd7c
manipulate grand total for inclusive tax
2015-03-13 18:23:10 +05:30
Anand Doshi
9d9e31f4e8
moved get_list_context to module
2015-03-13 12:48:05 +05:30
Nabin Hait
7c9d003917
Test case cleanup and fixes
2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693
Test case fixes
2015-03-13 08:14:45 +05:30
Sambhaji Kolate
feff40a930
update get_batch_no query to sort batch with expiry date
...
small fix to avoid error msg if item_code not selected and batch_no is entered
2015-03-11 11:50:28 +05:30
Sambhaji Kolate
845f1c636e
code cleanup
2015-03-10 15:19:29 +05:30
Sambhaji Kolate
98dbccd1d6
added actual_batch_qty at warehouse in DN & SI #1873
2015-03-10 15:04:28 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Nabin Hait
b50833a1e8
Fields alignment
2015-03-04 16:14:02 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Anand Doshi
5bd8cfd9fe
[fix] queries
2015-02-26 12:40:58 +05:30
Nabin Hait
8be6939288
help description for party account
2015-02-26 12:31:07 +05:30
Anand Doshi
d35354cc06
Merge remote-tracking branch 'frappe/develop' into v5.0
...
Conflicts:
erpnext/__version__.py
erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
erpnext/hooks.py
erpnext/patches.txt
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
erpnext/stock/get_item_details.py
erpnext/translations/ar.csv
erpnext/translations/bs.csv
erpnext/translations/ca.csv
erpnext/translations/el.csv
erpnext/translations/es.csv
erpnext/translations/fr.csv
erpnext/translations/hr.csv
erpnext/translations/id.csv
erpnext/translations/is.csv
erpnext/translations/ja.csv
erpnext/translations/nl.csv
erpnext/translations/pl.csv
erpnext/translations/pt-BR.csv
erpnext/translations/ru.csv
erpnext/translations/tr.csv
erpnext/translations/zh-cn.csv
erpnext/translations/zh-tw.csv
setup.py
2015-02-24 18:12:17 +05:30
Nabin Hait
93b3a37a3b
rounding issue and rate trigger
2015-02-24 17:08:51 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +05:30
Anand Doshi
d57e793bf3
[fix] Added unicode_literals if missing in py files
2015-02-24 12:24:53 +05:30
Nabin Hait
7b19b9ed02
minor fixes
2015-02-24 10:04:00 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Nabin Hait
37b047d9a8
Fields added in all sales and purchase doctypes
2015-02-24 10:02:28 +05:30
Nabin Hait
613d081a60
Validate taxes and charges input, commonified
2015-02-24 10:02:28 +05:30
Nabin Hait
e9eec93be7
minor fix
2015-02-24 10:02:27 +05:30
Nabin Hait
f0bc9b6d3a
Renamed Net total to Total and dynamic label
2015-02-24 10:02:27 +05:30
Nabin Hait
de9c8a9028
discount calculation and in print view
2015-02-24 10:02:27 +05:30
Nabin Hait
2b019ed430
Fixes for discount amount
2015-02-24 10:02:27 +05:30
Nabin Hait
ce24512ed7
Commonified sales/purchase taxes and charges master.js code
2015-02-24 10:02:27 +05:30
Nabin Hait
e7679703cf
Taxes and totals calculation in party currency
2015-02-24 10:02:27 +05:30
Anand Doshi
f9fc04ce8e
Website Listing
2015-02-23 22:34:27 +05:30
Rushabh Mehta
93b2f167f8
[fixes] opportunity, task minor
2015-02-23 14:43:16 +05:30
Rushabh Mehta
d54031f3b5
[tests] [projects] merged tasks and projects and added quick edit of tasks from projects
2015-02-22 22:32:39 +05:30
Rushabh Mehta
813f0eda05
[form] section labels
2015-02-20 16:02:48 +05:30
Rushabh Mehta
dc93e0adc6
[fixes] stock reco
2015-02-20 15:11:56 +05:30
Rushabh Mehta
50dc4e90e3
[cleanup] item grid views, removed desc etc
2015-02-19 20:05:45 +05:30
Rushabh Mehta
c7a11cc451
[usability] [fixes] stock entry and production order
2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26
[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation
2015-02-19 14:53:31 +05:30
Nabin Hait
3fa7cc524b
Update sales_order_item.json
2015-02-18 21:11:45 +05:30
Rushabh Mehta
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Neil Trini Lasrado
d8b35639d8
image feild made hidden
2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
c48f06c095
Image field and view added to all selling doctypes
2015-02-18 12:33:19 +05:30
Neil Trini Lasrado
66df3566a9
html item desc removed from item master, item image added in oppurtunity
2015-02-18 12:32:37 +05:30
Nabin Hait
fe81da2dd1
listview indicator fix
2015-02-18 12:23:18 +05:30
Nabin Hait
da5f766dd5
fixed conflict
2015-02-18 11:55:13 +05:30
Anand Doshi
8c0f05fbae
[minor] grid report loading
2015-02-17 19:53:23 +05:30
Nabin Hait
bd00e81ad5
Commonified taxes and totals calculation in server side
2015-02-17 12:50:51 +05:30
Nabin Hait
6f0a3ed8d4
fixed conflict
2015-02-17 11:12:04 +05:30
Rushabh Mehta
60cfccbf77
[new-module] crm
2015-02-17 10:36:54 +05:30
Nabin Hait
188f69a713
commonified totals calculation in js
2015-02-12 17:55:50 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
461ee2ebae
Renamed total fields
2015-02-12 11:47:45 +05:30
Nabin Hait
7945712171
Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc
2015-02-11 12:55:10 +05:30
Nabin Hait
8fa503e177
Fixed conflict while merging v4 into v5
2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f
Moved flags like ignore_mandatory, ignore_validate etc to doc.flags
2015-02-10 14:41:27 +05:30
Neil Trini Lasrado
47a62c623c
fixes for #2655
2015-02-06 15:51:20 +05:30
Anand Doshi
9b30a8626c
[minor] removed default filters for sales order and material request, fixed pos css
2015-02-06 12:30:08 +05:30
Nabin Hait
5e13e0c316
net_total and grand_total mismatch issue
2015-02-05 17:18:03 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Rushabh Mehta
0e13221338
[print] item tables - override description and uom
2015-02-04 17:02:24 +05:30
Nabin Hait
d2b762d760
Merge pull request #2617 from neilLasrado/sales-order
...
sales order - allow same item to enter multiple times. Throws warning
2015-02-02 16:44:12 +05:30
Neil Trini Lasrado
809abdf295
lead report - state, country and pincode seprated from address
2015-02-02 11:43:56 +05:30
Rushabh Mehta
052bd624c1
[minor] removed company description and don't call apply_price_list if no items
2015-01-30 16:57:24 +05:30
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Nabin Hait
22a4b82bd2
Minor fixes
2015-01-28 13:11:49 +05:30
Anand Doshi
8147f74e4e
[minor] Mandatory filters in Customer Acquisition and Loyalty
2015-01-27 13:16:18 +05:30
Nabin Hait
d41f3c1f5e
All the calculations in taxes_and_totals file
2015-01-23 16:24:49 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Nabin Hait
b4a3dfa893
All the calculations in taxes_and_totals file
2015-01-22 17:13:13 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Neil Trini Lasrado
f108c2df72
sales order - allow same item to enter multiple times. Throws warning
2015-01-21 14:33:49 +05:30
Nabin Hait
ea61046e8d
Updated Quotation Status
2015-01-21 14:08:06 +05:30
Rushabh Mehta
81e972eac4
[cleanups]
2015-01-19 17:34:54 +05:30
Nabin Hait
dd4617d30f
Opportunity From field is mandatory
2015-01-16 15:08:00 +05:30
Nabin Hait
239c2c327c
Hide currency and price list section after submission
2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Nabin Hait
2244ac4d52
Discount amount in party currency
2015-01-12 17:35:37 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
a17d7cea34
test records fixed
2015-01-07 15:42:59 +05:30
Rushabh Mehta
738d4ef5c8
[ui] [listviews] indicators
2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f
[design] Point of Sale
2015-01-06 17:14:26 +05:30
Rushabh Mehta
e1cb0ae738
[design] list views
2015-01-05 17:39:05 +05:30
Nabin Hait
5515b1ea7f
minor fix
2015-01-05 08:18:15 +05:30
Nabin Hait
8a00319962
minor fix
2015-01-04 17:27:40 +05:30
Anand Doshi
3f5e95a99e
[design] Fixed Grid Reports
2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c
[ux] fixed creation via tree views for Item Group etc
2015-01-01 15:59:34 +05:30
Rushabh Mehta
bfaf0a8f43
[tree] [ui]
2015-01-01 12:49:18 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
4096a3ab2b
[design] form toolbar
2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99
[design] pos
2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
cb11f27558
Customer should not copied from lead to opoortunity
2014-12-19 10:51:59 +05:30
Nabin Hait
0f2137be18
no copy property for customer's po no
2014-12-16 10:37:55 +05:30
Nabin Hait
ad0bd4ca92
Pull all customer's po no in delivery note when made from multiple sales order
2014-12-12 12:49:45 +05:30
Nabin Hait
5cc0531d27
Merge pull request #2451 from revant/develop
...
"From time" cannot be later than "To time" and hours cannot be negative
2014-12-02 14:27:00 +05:30
Revant Nandgaonkar
d0a44ca85c
Changed contact_date to Datetime so appointment or call with time can be scheduled
2014-12-01 23:31:53 +05:30
Nabin Hait
1b5afe737f
Fixes in authorization rule based on average discount
2014-11-28 16:59:32 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28
[rename] Support Ticket -> Issue
2014-11-28 11:46:10 +05:30
Nabin Hait
249bbbc56f
fixes during testing version 5
2014-11-26 15:35:39 +05:30
Nabin Hait
b74ae7aa31
Minor fix for order to invoice mapping
2014-11-24 18:17:01 +05:30
Rushabh Mehta
2f4567fa3c
[minor] [ux] address refresh for lead
2014-11-24 15:18:40 +05:30
Rushabh Mehta
7d36875d6f
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:47 +05:30
Nabin Hait
ccd9fd3e94
Rounding in totals calculation
2014-11-14 14:27:24 +05:30
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Neil Trini Lasrado
6fc2821e5f
fix - validations added for auto fetch of cost center
2014-10-28 14:36:26 +05:30
Nabin Hait
10b155a486
cost center based on project
2014-10-23 13:18:59 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Nabin Hait
73804580d4
validate quotation to lead or customer
2014-10-20 11:18:11 +05:30
Nabin Hait
30a0e3e8b4
Merge pull request #2275 from ankitjavalkarwork/fix2164
...
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +05:30
ankitjavalkarwork
ad3d698fd8
[ #2164 ] Add test case for delivered qty in Sales Order
2014-10-10 16:59:47 +05:30
ankitjavalkarwork
e69a611991
[ #2164 ] New field names in DN, fix field name refs, Patch added
2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
eaae58f507
Transaction.js fixed , code commonified
2014-10-09 15:01:13 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6
Fixed issues
2014-10-09 15:01:12 +05:30
ankitjavalkarwork
e93b1fc508
[fix][ #1450 ] Add Shipping Addr field to Sales Invoice
2014-10-09 12:11:49 +05:30
ankitjavalkarwork
1b2944e871
Rearrange To/From, Recurring Type field for better UX
2014-10-08 14:24:58 +05:30
ankitjavalkarwork
fe7a6b502a
Add Customer Credit Balance Report, minor changes
2014-10-07 11:41:31 +05:30
Nabin Hait
f065b756e5
Update customer.json
2014-10-06 17:50:58 +05:30
Nabin Hait
997a7a1d3e
Test case fixes
2014-10-06 13:15:21 +05:30
Nabin Hait
db030d1761
Set Receivable/Payable account based on party
2014-10-06 13:13:27 +05:30
Nabin Hait
e2095c0dd7
Created new doctype Party Account to maintain default party account, it is a child table for Customer, Supplier, Customer Group, Supplier type
...
Default Receivable / Payable Account in company
Filter results in all receivable/payable link fields
2014-10-06 13:12:05 +05:30
Nabin Hait
3a40435f8c
Credit days and credit limit option in customer group / supplier type #1354
2014-10-06 13:05:28 +05:30
Nabin Hait
e9daefe07f
Credit Limit and credit days fixes #2031
2014-10-06 13:05:28 +05:30
Nabin Hait
be8ec39678
Deleted master_type, master_name, credit_days, credit_limit fields from account
...
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
2014-10-06 13:02:40 +05:30
ankitjavalkarwork
9e5f319d80
[ #2253 ] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO
2014-10-06 12:58:38 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Stefan Siegel
76a8c75592
Fix opportunities not showing in "Linked With" dialog
2014-10-03 13:25:42 +02:00
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
Anand Doshi
8370cb3e71
Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop
2014-09-18 12:06:05 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
Nabin Hait
c25681c36c
Added item group and brand in sales-person-wise transaction summary report
2014-09-16 12:28:40 +05:30
Sambhaji Kolate
930e7f5578
fix conflict
2014-09-15 12:43:48 +05:30
81552433qqcom
951da0ca3d
added translations to report py file.
2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42
translations.
2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54
various translation missed __()
2014-09-12 16:07:11 +05:30
Anand Doshi
61a591944b
[minor] ui/ux fixes in Payment Tool
2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817
Payment Tool #2106
2014-09-12 15:23:46 +05:30
Anand Doshi
2f9c36a588
Merge pull request #2175 from ankitjavalkarwork/fix2153
...
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-11 16:47:08 +05:30
Sambhaji Kolate
b14401c320
change convert_to_recurring() to take recurring_id dynamicaly
2014-09-11 16:09:05 +05:30
ankitjavalkarwork
5e34383e25
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-10 17:54:42 +05:30
Anand Doshi
fc33d5a75b
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-09 15:25:43 +05:30
Anand Doshi
45c9b1c065
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-08 17:42:17 +05:30
ankitjavalkarwork
aaac7c17b8
Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document
2014-09-01 16:22:56 +05:30
ankitjavalkarwork
e60822b094
Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors
2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3
Commonify Recurring Sales Order/Invoice
2014-09-01 16:20:59 +05:30
Anand Doshi
98ff85dea1
Merge pull request #2108 from neilLasrado/fix-issue-448
...
[Fix] Issue #448
2014-08-29 15:46:13 +05:30
Anand Doshi
37cb544839
[fix] default quotation list filter
2014-08-28 11:27:18 +05:30
Neil Trini Lasrado
d6d71e8078
[fix] issue 448 final 1
2014-08-27 18:48:57 +05:30
Anand Doshi
43f087c99d
[hotfix] Supplier read permission for Purchase User
...
[Fix] Issue #448
[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Rushabh Mehta
e8dd4160d4
[cleanup] remove allow_attach
2014-08-25 13:04:21 +05:30
Nabin Hait
f4ad37d208
Reset receiver list always on create receiver list button
2014-08-22 12:42:57 +05:30
Rushabh Mehta
cb067aa579
[route] refactor, wip
2014-08-20 11:44:30 +05:30
Anand Doshi
f72de95a38
[fix] SMS Center
2014-08-18 19:51:47 +05:30
Anand Doshi
eb39435481
[hotfix] Allow on submit for Projected Qty
2014-08-14 18:08:19 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Anand Doshi
f0075b9ce2
[fix] Opportunity communication listing
2014-08-12 15:20:39 +05:30
Anand Doshi
42335fb2cb
[minor] Allow on Submit - Actual / Projected Qty
2014-08-11 13:28:29 +05:30
Anand Doshi
5d64f5abd4
[hotfix] Sales Order list
2014-08-09 14:54:52 +05:30
Anand Doshi
03eadb74ab
Fixes to microtemplate feature
2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a
added templates for projects
2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5
more updates to lists and started sane filters
2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015
added listviews for sales, purchase
2014-08-08 11:56:31 +05:30
Rushabh Mehta
67af99794d
start custom list rendering for Sales Order
2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a
built item grids for sales, purchase, stock
2014-08-08 11:56:31 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
Anand Doshi
959bd6e9e7
[test] Block Delivery Note if it is linked to a cancelled Sales Order
2014-08-05 14:25:40 +05:30
Nabin Hait
1279f1d430
Fixes for customer / supplier renaming
2014-08-04 13:05:59 +05:30
Anand Doshi
29817d6d8b
[print] Moved Total Taxes and Charges to the right column
2014-07-31 16:05:19 +05:30
Anand Doshi
fbe37c9158
Labels: Use Date instead of Posting Date
2014-07-31 14:31:25 +05:30
Anand Doshi
627f13ea26
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 13:09:01 +05:30
Anand Doshi
bc708ee4c2
[print] Disable rounded total
2014-07-29 22:24:31 +05:30
Anand Doshi
9c018fe984
[minor] Fixed address listing
2014-07-28 12:59:52 +05:30
Anand Doshi
a5437cdac1
Fixes for print
2014-07-25 13:02:28 +05:30
Rushabh Mehta
5b51cc86a9
many fixes to print
2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c
cleanup for print format
2014-07-25 13:01:52 +05:30
Rushabh Mehta
28804bfb62
started sales order print format (new style)
2014-07-25 13:01:52 +05:30
Anand Doshi
e8c5cb8c9a
Fixed Address and Contact report name
2014-07-14 13:10:24 +05:30
nabinhait
d5fb5d91e9
overflow validation fixed
2014-07-10 15:27:27 +05:30
Anand Doshi
a96cf5b96b
Print Hide other charges calculation
2014-07-10 12:16:39 +05:30
nabinhait
8e4fcca216
Get query fixes in address in contact listing. Fixes #1911
2014-07-09 12:50:50 +05:30
nabinhait
ff2cc1626e
Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list
2014-07-08 15:30:25 +05:30
Anand Doshi
cf6d31cefc
Sales Order: Fixed test case
2014-07-07 18:46:02 +05:30
nabinhait
2c0c66e756
Update delivery and billing status in SO
2014-07-07 17:56:25 +05:30
Rushabh Mehta
58692fe4d1
sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment
2014-07-07 12:29:43 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
Rushabh Mehta
501b2cc617
duplicate name fix for customer
2014-07-02 18:01:30 +05:30
Anand Doshi
c33ae0c7df
Minor fix: commonified message.
2014-07-01 16:27:24 +05:30
Anand Doshi
da8adea0a9
Fixed customer test
2014-06-30 17:28:52 +05:30
Anand Doshi
0e72a87613
Improved test_rename: check if comments are also moved on rename
2014-06-30 17:05:51 +05:30
Anand Doshi
11ada53ed5
Fixes related to Website Route system and other misc fixes
2014-06-28 12:13:11 +05:30
Anand Doshi
e0a7ff77df
Merge pull request #1838 from nabinhait/v4-hotfix
...
Multiple fixes
2014-06-24 17:37:39 +05:30
Nabin Hait
60c48fee16
minor fixes
2014-06-24 17:34:52 +05:30
Nabin Hait
0b15755441
Cost center-wise net profit in financial analytics report
2014-06-24 17:02:45 +05:30
Anand Doshi
83da92fdcc
Naming Series Property Setter Patch
2014-06-23 18:04:07 +05:30
Nabin Hait
e84f8b23aa
minor fix in sales invoice
2014-06-23 15:36:30 +05:30
Nabin Hait
444f956e7b
Pricing Rule fixes and improvements. Fixes #1795
2014-06-20 16:00:45 +05:30
Anand Doshi
a5cfc59d81
Validate Select field values
2014-06-19 16:05:08 +05:30
Anand Doshi
d768afb80b
Fixed Sales Order -> Delivery Note mapping of address fields
2014-06-18 15:23:25 +05:30
Nabin Hait
ac1a4ed576
Field renamed in sms center
2014-06-18 10:20:01 +05:30
Nabin Hait
b73d3f925d
Do not make packing list after submission
2014-06-18 10:18:50 +05:30
Rushabh Mehta
69641ddc36
Update sms_center.json
...
changed total words to total characters
2014-06-18 09:04:09 +05:30
Anand Doshi
205438669a
Removed clear_custom_buttons, pos view switch fix
2014-06-12 15:00:51 +05:30
Rushabh Mehta
880b3ef6c0
added qty updating option multi-item selector
2014-06-06 11:45:30 +05:30
Rushabh Mehta
ba83e9cfbe
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-05 17:56:42 +05:30
Rushabh Mehta
c02fbd22fa
removed address_title from address and removed test
2014-06-05 16:16:13 +05:30
Anand Doshi
85479bcbc0
Fixes for apply user permissions and momentjs
2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890
Apply User Permissions optional in Script and Query Reports
2014-06-04 17:48:58 +05:30
Anand Doshi
4985691617
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344
Role and User Permissions
2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635
Permission relogication continued
2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7
Started permission relogication
2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51
Merge pull request #1744 from rmehta/develop
...
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087
added multiple item select and allow non purchase items in Material Request of type transfer
2014-06-04 13:10:41 +05:30
Nabin Hait
b15764ef2c
Translation issue fixed in analytics/grid report
2014-06-03 13:02:39 +05:30
Anand Doshi
be99b1240c
Merge pull request #1722 from nabinhait/v4-hotfix
...
multiple fixes
2014-06-02 11:09:32 +05:30
Rushabh Mehta
cc37cc83cd
removed section_style
2014-05-31 10:36:41 +05:30
Nabin Hait
0984f227a8
minor fixes related to path
2014-05-30 19:10:12 +05:30
Nabin Hait
8de61559b0
Minor fixes in sales / purchase analytics. Fixes #1701
2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
2014-05-30 11:22:10 +05:30
Rushabh Mehta
f944e819e9
fixes #1581 and added icons to grid reports
2014-05-27 15:22:04 +05:30
Rushabh Mehta
a39cae9c2e
added title field to support ticket, lead and employee
2014-05-21 17:34:22 +05:30
Nabin Hait
956d7868b5
removed print statement
2014-05-20 10:36:14 +05:30
Nabin Hait
2e0620e370
Server side onload functionality in multiple docs
2014-05-19 18:15:58 +05:30
Anand Doshi
54b7962eb9
Pass frm to open_mapped_doc
2014-05-14 17:38:45 +05:30
Anand Doshi
4c83e407a9
Changed Print Format files to lowercase
2014-05-13 17:58:30 +05:30
Nabin Hait
aade34b0c9
Reports and print formats modified for renamed fields
2014-05-13 16:12:37 +05:30
Anand Doshi
78e9c6ef70
Deprecate Select fields with options as link:
2014-05-09 13:36:13 +05:30
Nabin Hait
e37b8e6682
fixed conflict
2014-05-07 19:20:56 +05:30
Anand Doshi
f410bd9bf9
Better default permissions, ignore_restrictions for defaults, removed field trash_reason
...
Additions:
Account --> Material User: Read
Cost Center --> Sales User, Purchase User: Read
Mode of Payment --> Accounts User: Read
Supplier --> Material User, Accounts User: Read
Employee --> Employee: Restricted Read
Leave Type --> Employee: Read
Production Order --> Material User: Read
Sales Order --> Material User: Read
Print Heading --> All: Read
Terms and Conditions --> Purchase User, Material User: Read
Territory --> Material User, Maintenance User: Read
Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
Price List --> Manufacturing User: Read
Purchase Receipt --> Accounts User: Read
Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Nabin Hait
706eb7f2c7
fixed conflict
2014-05-07 15:13:52 +05:30
Nabin Hait
90f2d8d9fc
minor fix
2014-05-07 14:55:09 +05:30
Anand Doshi
8c2dbab878
Changed default naming series options
...
C-Form: C-FORM-.#####
Purchase Invoice: PINV-.#####
Sales Invoice: SINV-.#####
Purchase Order: PO-.#####
Quality Inspection: QI-.#####
Supplier: SUPP-.#####
Supplier Quotation: SQTN-.#####
Attendance: ATT-.#####
Production Order: PRO-.#####
Installation Note: IN-.#####
Lead: LEAD-.#####
Opportunity: OPTY-.#####
Quotation: QTN-.#####
Sales Order: SO-.#####
Delivery Note: DN-.#####
Item: ITEM-.#####
Material Request: MREQ-.#####
Packing Slip: PS-.#####
Purchase Receipt: PREC-.#####
Stock Entry: STE-.#####
Customer Issue: CI-.#####
Support Ticket: SUP-.#####
Customer: CUST-.#####
Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Anand Doshi
d9f0f27cd4
Fixes in test cases
2014-04-30 22:16:25 +05:30
Anand Doshi
a47bf2ab66
Removed check for duplicate in sales bom, set default income account in Company
2014-04-30 18:54:05 +05:30
Anand Doshi
f62da519d6
Sales BOM Parent Item search - Fixes #1544
2014-04-30 16:50:39 +05:30
Nabin Hait
6777efa7fa
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-04-28 17:09:13 +05:30
Nabin Hait
48962e1148
Minor fix in sales funnel report
2014-04-28 15:43:32 +05:30
Anand Doshi
65f83cbae7
BugFix: Sales Order with Order Type as Shopping Cart
2014-04-28 15:33:34 +05:30
Anand Doshi
e3f6b6d899
Fixed Opportunity Lost UX
2014-04-25 18:36:06 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
8c62c40a3d
Fixed Make Sales Order from Quotation #1522
2014-04-24 12:40:19 +05:30
Anand Doshi
78eeacb53c
Fixes in Lead, Opportunity, Quotation, Setup Wizard
2014-04-23 19:15:15 +05:30
Anand Doshi
f50a65294f
Fixed NameError handling
2014-04-23 13:41:28 +05:30
Anand Doshi
b054eb7a4f
Call calculate_taxes_and_totals after mapping
2014-04-22 20:35:22 +05:30
Anand Doshi
3e41fd1fd3
List route for tree browser based doctypes; Fixes to add child in tree browsers
2014-04-22 18:55:21 +05:30
Anand Doshi
cbbf451974
Fixes throw
2014-04-21 11:33:49 +05:30
Anand Doshi
5d591ebe83
Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext
2014-04-18 16:20:07 +05:30
Anand Doshi
ac32bad25a
Fixes in Taxes, Quotation and Address Territory
2014-04-18 01:32:02 +05:30
Rushabh Mehta
c38fc713c6
updated translations
2014-04-16 17:46:30 +05:30
Rushabh Mehta
8c51318d82
added naming series for campaign #1413
2014-04-16 17:41:52 +05:30
Rushabh Mehta
e8b0402a10
added naming series for campaign #1413
2014-04-16 17:41:52 +05:30
Rushabh Mehta
c635875765
added naming series for campaign #1413
2014-04-16 17:41:51 +05:30
Anand Doshi
652bc0784a
Ported v3 fixes to v4
...
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
2014-04-16 15:26:42 +05:30
Rushabh Mehta
ff93802d58
more message fixes
2014-04-15 18:40:31 +05:30
Rushabh Mehta
2c45899a02
fixed strings for translation
2014-04-15 14:41:56 +05:30
Pratik Vyas
f37d6fe32b
Merge pull request #1514 from frappe/js-translate-refactor
...
JS translation refactor
2014-04-15 11:44:16 +05:30
Pratik Vyas
e1eeb22f1e
remove linebreaks for translation strings (js)
2014-04-15 10:50:36 +05:30
Rushabh Mehta
9f0d625300
update translation strings #1403
2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e
js translations refactor
2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142
frappe._ to __
2014-04-14 16:25:30 +05:30
Anand Doshi
bd67e87921
Fixes saving of Sales Order and fetching Prices frappe/frappe#478
2014-04-11 16:51:27 +05:30
Anand Doshi
13ae548ff6
Fixes for model-cleanup frappe/frappe#478
2014-04-10 18:43:07 +05:30
Anand Doshi
9fd50bcfb6
Fixed rest of the test cases frappe/frapp#478
2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d
Fixed Test Cases frappe/frappe#478
2014-04-08 20:15:22 +05:30
Anand Doshi
cd71e1d8ab
Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478
2014-04-08 13:53:35 +05:30
Nabin Hait
088dec6c09
testcase fixes #478
2014-04-07 16:00:28 +05:30
Nabin Hait
dc82d4f0cd
frappe/frappe#478 fixes
2014-04-07 12:02:57 +05:30
Nabin Hait
e7885e3ee0
frappe/frappe#478 replaced doclist in testcases
2014-04-04 13:26:50 +05:30
Nabin Hait
365ae27acf
frappe/frappe#478 fixes
2014-04-03 17:38:54 +05:30
Rushabh Mehta
2fbb00fd8d
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:38:22 +05:30
Rushabh Mehta
f14b809ab5
frappe/frappe#478 , more changes, removed bean
2014-04-03 14:30:42 +05:30
Rushabh Mehta
f191f854cd
frappe/frappe#478 erpnext install works
2014-04-02 18:09:34 +05:30
Anand Doshi
5b552b51f1
frappe/frappe#478
2014-04-02 15:03:35 +05:30
Rushabh Mehta
f2227d033c
frappe/frappe#478 , removed instances of .fields
2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58
frappe/frappe#478 added test_records.json
2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2
frappe/frappe#478 , frappe tests pass, .txt renamed to .json
2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9
frappe/frappe#478
2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc
frappe/frappe#478
2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e
frappe/frappe#478
2014-03-28 16:54:45 +05:30
Anand Doshi
81ba0b29da
frappe/frappe#478
2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28
Replaced doc, doc.fields frappe/frappe#478
2014-03-28 13:55:00 +05:30
Anand Doshi
40534f076b
Changed creation, modified format frappe/frappe#478
2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608
frappe/frappe#478
2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a
frappe/frappe#478
2014-03-27 17:51:41 +05:30
Rushabh Mehta
d2b34dc30c
frappe/frappe#478
2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0
#478
2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf
refactored client side Model and Meta - frappe/frappe#478
2014-03-26 18:24:30 +05:30
Nabin Hait
d6e4ab3fd4
maintenance schedule: validate amc dates and update in serial no
2014-03-26 10:23:27 +05:30
Nabin Hait
0c9d42258c
Minor fix related to pos paid amount
2014-03-25 19:35:41 +05:30
Nabin Hait
2c517e0a62
Fixes related to countrywise coa
2014-03-25 18:28:49 +05:30
Nabin Hait
73083dc960
Fix related to user_default
2014-03-21 11:26:08 +05:30
Nabin Hait
482ffac83f
Set paid amount to zero if not pos
2014-03-21 11:26:07 +05:30
Nabin Hait
4d713ac5ba
sql injection fixes
2014-03-21 11:22:37 +05:30
Anand Doshi
4b2692182a
Fixes after change in fields handling in Document
2014-03-19 16:58:42 +05:30
Nabin Hait
54106807e4
Set paid amount to zero if not pos
2014-03-13 17:26:41 +05:30
Nabin Hait
a8dbb0dd41
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-13 17:23:24 +05:30
Rushabh Mehta
7c932003ed
rename Profile to User frappe/frappe#470
2014-03-11 16:15:59 +05:30
Anand Doshi
09a9f4c0c9
Added module to Report doctype
2014-03-07 17:20:22 +05:30
Rushabh Mehta
d8de921c40
fixed erpnext/frappe#1441 and other pos related cleanups
2014-03-06 15:40:22 +05:30
Rushabh Mehta
73f0bf36c1
fixed #1454
2014-03-06 14:45:02 +05:30
Rushabh Mehta
4541875c81
removed searchfield condition from get_match_cond frappe/erpnext#1457
2014-03-06 11:19:46 +05:30
Anand Doshi
2d5727b17b
Ignore mandatory during email pulling
2014-03-05 19:24:07 +05:30
Nabin Hait
2d57b0aa52
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-03-05 10:51:04 +05:30
Anand Doshi
64f2ccd9e1
Global Settings in Setup, Sales Master Manager can restrict for Customer
2014-03-03 19:28:30 +05:30
Anand Doshi
f5794f1c07
Module Home Pages using Module View
2014-03-03 15:06:34 +05:30
Nabin Hait
8e4640f464
minor fix in report
2014-03-03 12:06:50 +05:30
Nabin Hait
311079a311
Patch: copy customer discount to pricing rule
2014-02-28 13:04:19 +05:30
Nabin Hait
08222150f2
Pricing Rule fixes and reference field in all item table
2014-02-28 13:02:00 +05:30
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Anand Doshi
4362443b6e
Propagate ignore_permissions during mapping from quotation to sales order
2014-02-25 15:42:32 +05:30
Anand Doshi
201dbbd977
Quotation Item Table can be empty
2014-02-25 15:42:32 +05:30