mbauskar
f03afe0878
Merge branch 'master' into staging
2017-08-14 09:31:01 +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
rohitwaghchaure
5999ade43a
[Fix] Auto batch creation not working for purchase invoice is update stock is enabled ( #10348 )
2017-08-09 17:24:13 +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
Nabin Hait
564e8b74dc
Minor fixing in setting cumulative tax amount
2017-08-01 16:35:22 +05:30
Nabin Hait
4ada637b17
Update taxes_and_totals.js
2017-08-01 16:20:59 +05:30
Kanchan Chauhan
d0c5b3eb07
[URGENT] this is me
2017-08-01 16:02:01 +05:30
Nabin Hait
cd95134267
Rounding issue in tax calculation ( #10135 )
...
* Adjust rounding loss of discount in the last item row. Fixes #8952
* Fixed rounding issue in tax calculation. Fixes #8953 , #8952 , #8893 , #6954 , #8910
* Rounding related fixes for purchase cycle
2017-07-31 18:07:45 +05:30
Faris Ansari
40d3ad2bb4
Add erpnext-grey.png, add logo in footer ( #10101 )
...
* Add erpnext-grey.png, footer html
* Sent via ERPNext
2017-07-31 16:16:22 +05:30
Makarand Bauskar
20f4d7f559
Merge branch 'develop' into set_defualt_mode_payment
2017-07-28 14:41:48 +05:30
Rushabh Mehta
0fcf44e1a2
User Permissions Redesign ( #10006 )
...
* [fixes] for user permission
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
2017-07-28 14:33:15 +05:30
Rohit Waghchaure
5296e3c321
[enhance] Provision to set default mode of payment for the POS in POS profile
2017-07-27 19:17:05 +05:30
Faris Ansari
fbec103ae7
Remove inline styling, add css classes ( #10077 )
2017-07-26 18:46:13 +05:30
Prateeksha Singh
83535811ad
[minor][wiz] fix company image alignment ( #10114 )
2017-07-26 18:11:37 +05:30
Prateeksha Singh
cda6206c1f
[minor][wiz] remove header brand image ( #10016 )
2017-07-26 13:05:48 +05:30
Rohit Waghchaure
baa937aa52
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
2017-07-25 15:26:01 +05:30
Rushabh Mehta
35da7d1fb4
[minor] we buy is also checked by default
2017-07-20 15:58:20 +05:30
Rushabh Mehta
ced14cc789
[fix] setup-wizard
2017-07-20 15:55:54 +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
pratu16x7
aea60f349f
[minor] default qty 0, fixes frappe/erpnext#9880
2017-07-18 12:15:16 +05:30
pratu16x7
90bd5681d1
[batch modal] bind serial_no field in onchange
2017-07-18 12:15:16 +05:30
Prateeksha Singh
e012e24423
Sales Goal by Company ( #9723 )
...
* [sales goal] in company; dashboard, graph, notifs, wiz
* [test] target notifications
* cache past year monthly sales of every company daily, patch
* [minor] query fixes
* update sales goal docs
2017-07-18 10:35:12 +05:30
Nabin Hait
22e82dff20
Removed a deprecated function call
2017-07-17 20:28:30 +05:30
Nabin Hait
b962fc1573
Show hsn code in tax breakup for India and render via template ( #9866 )
...
* Show hsn code in tax breakup for India and render via template
* tax breakup if gst_tax_field does not exists
* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
Rushabh Mehta
dab1172a18
[refactor] party.js get_party_details ( #9888 )
2017-07-17 15:31:17 +05:30
strixaluco
372a881d8c
Make 'Financial Year' translatable in Setup wizard ( #9879 )
2017-07-17 12:06:25 +05:30
mbauskar
1394a6557d
[minor] check mode_of_payment in Payment entry
2017-07-14 12:09:17 +05:30
Makarand Bauskar
8f507a984e
[minor] check if the company is selected or not before triggering get_bank_cash_account ( #9830 )
...
* [minor] check if the company is selected or not before triggering get_bank_cash_account
* [minor] check if production order is available
* [minor] fixed codacy errors
2017-07-13 11:44:29 +05:30
Nabin Hait
57d3cecd68
Merge pull request #9811 from rohitwaghchaure/pricing_rule_issue_for_discount
...
[Fix] Manual discount is not applying in the transaction if discount amount is zero in the pricing rule
2017-07-13 11:14:53 +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
Rohit Waghchaure
b12f2109b5
[Fix] Manual discount is not applying on the pricing rule if discount amount is zero in the pricing rule
2017-07-12 18:02:02 +05:30
Nabin Hait
79c2191aa3
[fix] Don't add newline at the end, onchange of serial_no and filter warehouse based on company and is_group ( #9809 )
2017-07-12 14:10:43 +05:30
Makarand Bauskar
30f2bcbccc
[hotfix] allow only 5 character in company_abbr field in setup wizard ( #9779 )
2017-07-11 12:36:57 +05:30
Prateeksha Singh
7d885432eb
[wiz] add user slide, enforce first entry, static labels ( #9744 )
2017-07-11 12:36:34 +05:30
Rohit Waghchaure
296fbfeaac
[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice
2017-07-10 23:06:49 +05:30
Nabin Hait
4e21f11864
Merge pull request #9690 from rmehta/additional-discount-fix
...
[fix] reset flag after promise
2017-07-07 13:26:14 +05:30
Rushabh Mehta
19d52dc503
[fix] remove extra flag
2017-07-07 13:23:23 +05:30
Rushabh Mehta
6705ab3eaf
[fix] discount setting multiple times
2017-07-07 13:14:08 +05:30
Rushabh Mehta
233a19a373
[fix] reset flag after promise
2017-07-07 13:06:29 +05:30
Nabin Hait
fbb5945ff3
Fixed itemised tax calc to fix pos loading
2017-07-07 12:58:22 +05:30
Makarand Bauskar
88a37c17a6
[hotfix] commit after every 200 production orders ( #9674 )
2017-07-06 19:13:09 +05:30
Nabin Hait
d59819d9bb
Date format issue fixed in setup wizard
2017-07-06 16:12:59 +05:30
Nabin Hait
f3f0dfef2a
Invoice copy, state code in gst print format, hsn code in other sales/purchase docs ( #9658 )
...
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs
* Formatted Net Amount in item-tax-breakup
* GST print format fixes
* removed trailing whitespace
* removed trailing whitespace
2017-07-06 14:49:34 +05:30
Rushabh Mehta
63b06420e1
[fix] setup wizard dates ( #9646 )
2017-07-05 17:56:04 +05:30
Makarand Bauskar
bf66d7e041
[minor] setup wizard dates to yyyy-mm-dd format ( #9642 )
2017-07-05 17:26:34 +05:30
Nabin Hait
852cb64e4f
GST tax invoice print format and more ( #9616 )
...
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608
* Reload gst print format only for Indian users
* Fixes as Codacy
2017-07-05 12:58:19 +05:30
Prateeksha Singh
5e4c8ecd62
Setup wizard refactor ( #9441 )
...
* cleaned up slides, yet to decide on master data
* remove item_count
* [fix] refresh slides on domain bug
* UI test
* set header image here in ERPNext
* [minor] lint checks
* [wiz] change autofilled fiscal year format
* [minor] fixed date format to dd-mm-yyyy if fiscal year is not available for country
2017-07-03 18:23:57 +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
Ashwini Save
544de60d36
Adding ERPNext logo for email tempates.
2017-06-28 11:44:09 +05:30
Makarand Bauskar
90a3e60de7
Merge pull request #9372 from pratu16x7/serial-batch-entry
...
Serial no/batch entry dialog
2017-06-27 16:12:30 +05:30
pratu16x7
846f5d4bd8
[fix] cloning rows
2017-06-27 14:03:56 +05:30
Makarand Bauskar
5d8803b23e
Merge pull request #9435 from rmehta/gst
...
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
pratu16x7
29cebbb0cd
use set_value() for setting rows
2017-06-27 09:48:28 +05:30
pratu16x7
89d001caf3
[lint] fixes
2017-06-26 17:45:49 +05:30
pratu16x7
ae450fc23b
async call to require, more validation
2017-06-26 15:31:46 +05:30
pratu16x7
5f389c999a
[fix] values update in items in invoices
2017-06-26 13:38:24 +05:30
pratu16x7
577e4c4e28
Add in transaction.js, cleanups
2017-06-23 19:25:01 +05:30
rohitwaghchaure
8f51a5e527
In POS on click of delete button, remove the selected item from the cart ( #9428 )
2017-06-23 18:17:04 +05:30
Rushabh Mehta
25366a22ad
[minor] cleanup
2017-06-22 22:32:08 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Rushabh Mehta
b3c8f44b3e
[wip] GST for India. Pending reports
2017-06-22 22:31:32 +05:30
pratu16x7
759f669214
Add in delivery note
2017-06-22 18:14:29 +05:30
pratu16x7
70eca9462b
make erpnext.SerialNoBatchSelector
2017-06-22 18:14:29 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Rushabh Mehta
17e6bb83eb
[fix] typo, item group route to have parent only for non root
2017-06-20 14:07:33 +05:30
Britlog
faf75c4ddd
Fix and improve shopping cart ( #9348 )
...
* Fix and improve shopping cart
* Update shopping_cart.js
* Update shopping_cart.js
2017-06-20 12:51:32 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rushabh Mehta
36311020de
[minor] ux fixes
2017-06-20 09:31:06 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Umair Sayed
0dd5a20ca6
Help links added help_links.js ( #9170 )
...
* help links in help_links.js
* fixed in help_links.js
2017-06-07 20:05:35 +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
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +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
Nabin Hait
5b8b4dcce1
Merge branch 'master' into develop
2017-06-02 14:05:54 +05:30
Nabin Hait
ae07f22d8b
Fixed syntax error
2017-06-02 13:57:16 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
6a541a6f7a
Merge branch 'master' into develop
2017-05-26 21:35:42 +05:30
Francisco Roldán
44c1a610a1
Financial Statements Button translateabled ( #9032 )
2017-05-26 21:32:51 +05:30
Makarand Bauskar
157c334737
[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents ( #9037 )
2017-05-26 21:32:33 +05:30
CH
d0ebd7f7c2
POS translatable fields correction
2017-05-24 17:45:46 +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
Rohit Waghchaure
8a1c58c3c3
[fix] _ is not defined while accessing the POS
2017-05-19 13:01:32 +05:30
Francisco Roldán
85bfc05efa
Fix missing translations ( #8871 )
...
* Fix missing translations
* Fix
2017-05-17 19:42:04 +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
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Faris Ansari
125996e21c
Increase item cart height in mobile view ( Fixes #8827 ) ( #8846 )
2017-05-16 07:29:15 +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
Manas Solanki
426b8a14fd
Merge the student group and student batch ( #8663 )
...
* deleted student batch creation tool
* Patch for deleting the doctype and config
* Changes in the student attendance
* Patch for renaming the student batch as student group
* Changes in the student attendance
* Change in the student attendance reports
- Absent student report
- Student Batch-wise attendance
- Student monthly attendance sheet
* Changes in the patch
* Changes in the course schedule
* Changes in the course scheduling tool
* Change in the assessment plan
* Changes in the assessment result tool
* Cleanup
* Changes in the api.py
* create student group from student batch
* delete student batch
* add patch
* remove student batch from config/schools.py
* Delete the depricated doctype with patch
* Changes in patch
* Changes as per PR
2017-05-09 15:32:52 +05:30
Nabin Hait
17179ee83a
minor syntax fix
2017-05-06 13:23:12 +05:30
Nabin Hait
3257aeeb55
Price list rate fix multiple uom and validation with prev doc ( #8718 )
2017-05-06 12:47:14 +05:30
Nabin Hait
6e7407962f
Get exchange rate only if date and currency is present ( #8712 )
...
* Get exchange rate only if date and currency is present
* Update transaction.js
2017-05-06 12:45:16 +05:30
Nabin Hait
fcc0246b38
Get mobile nos for customer contact ( #8674 )
2017-05-04 12:11:48 +05:30
mbauskar
c482aeda1a
[fixes] added missing get_linked_material_requests method to buying utils
2017-05-02 14:05:54 +05:30
Nabin Hait
8c9fb76854
Remove pricing rules if 'Ignore Pricing Rule' manually triggered
2017-04-28 15:20:49 +05:30
Faris Ansari
5687e2da9d
[ui-fix] POS item list
2017-04-24 19:22:05 +05:30
