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
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
2017-04-19 21:05:37 +05:30
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
CH
61f4a8e757
Make the address type translatable in the Address_HTML field
2017-04-19 20:58:53 +05:30
mbauskar
ba41242f1f
[fixes] fixed the pricing rule issue https://github.com/frappe/erpnext/issues/8493
2017-04-19 20:54:23 +05:30
Rohit Waghchaure
019501e4a0
[fix] Balance Sheet, linking account to general ledger is not working
2017-04-19 20:46:30 +05:30
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
mbauskar
8a2e6f427b
[minor] if address is not found then set the address_field to '' instead of None
2017-04-17 13:58:52 +05:30
Faris Ansari
8371c1c4cd
Text overflow fix for product text in portal
2017-04-17 13:57:19 +05:30
mbauskar
22cedeb006
[minor] POS & RFQ format_number fixes
2017-04-17 12:24:24 +05:30
Faris Ansari
19f90e984e
[POS] Show stock quantity of items
...
- frappe/erpnext#8247
2017-04-12 16:06:31 +05:30
Rushabh Mehta
f0b4562a95
[refactor] move purchase_common.js -> public/js/controllers/buying.js
2017-03-31 17:36:48 +05:30
Rushabh Mehta
b66edd19ca
[minor] refactor transaction.js
2017-03-31 10:50:58 +05:30
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Rohit Waghchaure
5ecbaa408b
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 12:09:07 +05:30
Nabin Hait
8bf58367b8
Fixed merge conflict
2017-03-27 12:30:01 +05:30
Nabin Hait
9c8159be8f
Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue
...
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
2017-03-27 12:25:18 +05:30
Nabin Hait
9ba1be60b7
Merge pull request #8039 from netchampfaris/pos-ui-fix
...
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-23 17:14:39 +05:30
Nabin Hait
46bccb55c5
Merge pull request #8080 from rmehta/item-variants-by-mfg
...
[feature] ability to have variants based on manufacturer
2017-03-23 16:29:41 +05:30
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
Rohit Waghchaure
6ee91ec9c6
on selection of row highlight the background in the cart
2017-03-21 15:55:09 +05:30
rohitwaghchaure
2b9c95a940
Merge pull request #8043 from rohitwaghchaure/pos_issue_v8
...
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 17:56:20 +05:30
Rohit Waghchaure
75177c0e35
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 15:47:25 +05:30
Faris Ansari
d79f239001
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-16 12:18:35 +05:30
mbauskar
27efc91db0
[minor] make item code mandatory if update_stock is selected
2017-03-15 18:57:18 +05:30
Rushabh Mehta
f340e19ea7
[minor] field re-arrangements in sales invoice, purchase invoice, stock reco
2017-03-15 15:12:43 +05:30
Nabin Hait
ee7b4f2882
Merge pull request #8016 from rmehta/posting-date-option
...
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
mbauskar
f54b1047b8
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 17:57:47 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
87fa59a710
[Fix] Customer delete, customer edit functionality, added country field in the pos profile
2017-03-10 19:37:02 +05:30
Faris Ansari
1fe1518398
[pos] ui cleanup
2017-03-10 17:00:43 +05:30
Rohit Waghchaure
6068aecc2e
minor fix
2017-03-10 17:00:43 +05:30
Faris Ansari
07c9f35779
ui cleanup
2017-03-10 17:00:42 +05:30
Faris Ansari
45510109b6
[pos] cleanup
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
017f5005e0
fixed pos numeric keypad functionality
2017-03-10 17:00:42 +05:30
Faris Ansari
339d9c954a
minor changes
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
1312fe31a9
Provision to edit customer and address details
2017-03-10 17:00:42 +05:30
Faris Ansari
adcb3c62fa
wip
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
3b5a412a9c
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
56a7974b58
added event on numeric keypad
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
86ab6a93b4
[Enhancement] POS, numeric keypad
2017-03-10 17:00:41 +05:30
Faris Ansari
1f261a8695
UI changes
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
b5097ec161
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
f0c7ba4b1f
added event on numeric keypad
2017-03-10 17:00:40 +05:30
Rohit Waghchaure
e30f83a8af
[Enhancement] POS, numeric keypad
2017-03-10 17:00:40 +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
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Rohit Waghchaure
2087e574aa
[Fix] Serial nos not pulling on the delivery note, for language spanish add serial no button was not working
2017-02-27 13:43:04 +05:30
Kanchan Chauhan
6981870a40
[Fix] Add Serial No fix for other langauges
2017-02-27 12:54:13 +05:30
Neil Trini Lasrado
e4903b77b6
Added New Doctype - Assessment Code
2017-02-24 13:16:46 +05:30
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
Manas Solanki
f869a679ae
Fixed Student Attendence
2017-02-21 18:49:00 +05:30
Nabin Hait
391eca18c7
Fixed merge conflict
2017-02-20 19:38:22 +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
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
mbauskar
e1e25a0c9d
[minor] auto close opportunity after 7 days
2017-02-17 14:54:50 +05:30
Nabin Hait
6af7dd4e1b
Set fiscal year start and end date based on country
2017-02-17 14:47:33 +05:30
pratu16x7
462e89e452
[minor] margin fix
2017-02-14 17:18:10 +05:30
pratu16x7
0e94b4bec4
Mobile view fixes
2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90
Website data from existing child tables, layout, images
2017-02-14 17:18:09 +05:30
Kanchan Chauhan
779c581a92
[Minor] List of Contacts
2017-02-13 16:01:52 +05:30
suyashphadtare
049a88cc40
[minor] Show item quantity in warehouse set query
2017-02-10 19:14:43 +05:30
Neil Trini Lasrado
f37d329cf5
Merge branch 'develop' into eval-group
2017-02-02 17:30:10 +05:30
Neil Trini Lasrado
749516c22d
Renamed Evaluation Criteria to Assessment Criteria
2017-02-01 18:47:36 +05:30
rohitwaghchaure
c13dbd408f
[Enhancement] POS Redesign ( #7639 )
...
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
2017-02-01 18:07:22 +05:30
Makarand Bauskar
d893efd0a9
[minor] replace object values in translations ( #7602 )
2017-01-30 12:35:34 +05:30
rohitwaghchaure
3b40098738
Merge pull request #7571 from RicardoJohann/projectfilter
...
added project filter to gl and carry project filter from P&L
2017-01-30 12:24:36 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
8271b4c564
[minor] fixes in address filters
2017-01-30 10:45:28 +05:30
Ricardo Johann
34354237fd
added project filter to gl and carry project filter from P&L
2017-01-24 06:46:07 -03:00
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Nabin Hait
03f82240fa
Merge pull request #7222 from neilLasrado/assessment
...
Redesign Assessment Module
2017-01-17 11:04:02 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Neil Trini Lasrado
38bd62d82d
Merge branch 'develop' into assessment
2017-01-16 12:23:51 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
robert schouten
7a3d418aa5
Email inbox based off of frappe email inbox pr ( #7308 )
...
* email inbox
* inbox fixes
* separate email-inbox to pass tests
* separate email-inbox to pass tests
* fix import
* add more info to contact and address
2017-01-13 14:51:09 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
Rohit Waghchaure
8afe267813
[Fix] POS issues
2017-01-12 15:22:02 +05:30
Neil Trini Lasrado
2a9e0f6fd8
Added assessment result tool
2017-01-10 17:32:02 +05:30
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
802b4359b5
Fetch same items multiple times from source doc if all qty not processed
2017-01-09 15:32:20 +05:30
Nabin Hait
202bcc09d5
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
...
[Enhancement] POS features
2017-01-04 15:15:32 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Nabin Hait
ce5f942678
Merge branch 'master' into develop
2016-12-30 15:54:32 +05:30
Rohit Waghchaure
585448b225
set default terms and condition if tc_name is available on the form
2016-12-30 15:41:55 +05:30
Rohit Waghchaure
bef185c404
restrict user to edit the rate in the POS
2016-12-28 15:16:49 +05:30
Faris Ansari
0822e41f96
pos item area scrollable
2016-12-21 18:17:00 +05:30
Nabin Hait
3a8ea2a3bb
Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2
...
[POS] Provision to delete the offline records
2016-12-14 12:52:28 +05:30
Nabin Hait
82ce67d49a
Merge pull request #7190 from KanchanChauhan/jinja-in-tc
...
Jinja template in Terms and Conditions
2016-12-13 11:25:07 +05:30
Kanchan Chauhan
b642625ed2
Jinja template in Terms and Conditions
2016-12-12 17:34:30 +05:30
Rohit Waghchaure
9f2cc382a8
[POS] Provision to delete the offline records
2016-12-12 17:15:47 +05:30
Nabin Hait
0fa0af18cc
Merge pull request #7175 from neilLasrado/develop
...
Student Attendance Tool
2016-12-12 15:03:59 +05:30
Neil Trini Lasrado
eccbf43235
Renamed Student Batch Attendance Tool to Student Attendance Tool
...
Merged code for Student Attendance against Course Schedule and Student Batch
Student Attendance Tool now shows marked student attendance as well.
Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"
2016-12-09 17:41:09 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
87d70279c6
get exchange rate on change of date
2016-12-08 14:43:11 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +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
bhupen
3c7e70ffb3
[Fix] Disallow same items to be fetched multiple times in sales invoice
2016-11-30 14:32:11 +05:30
Rohit Waghchaure
b1b328865e
[Enhancement] Currency added in the BOM
2016-11-22 12:52:20 +05:30
Nabin Hait
8af429da1f
Cleanup and fixes in quality inspection feature
2016-11-16 17:22:38 +05:30
Manas Solanki
dbc2511a39
[Fix] Delivery Note fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
34feab1b25
[Fix] Redesign of quality inspection doctype
2016-11-16 17:22:38 +05:30
Manas Solanki
a8d1bc7ff4
[Fix] Quality Inspection in Purchase Invoice fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
c2cd3fd2c6
Function in parent transaction.js and call from corresponding files
2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5
Quality Inspection Issue
...
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
2016-11-16 17:22:38 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
Rushabh Mehta
440650d4a2
[fix] view shopping cart dropdown ( #6928 )
2016-11-14 13:13:53 +05:30
pratu16x7
84228402e6
Update erpnext manual link ( #6853 )
...
* Update erpnext manual link
* Update README.md
* Update conf.js
2016-11-07 17:18:15 +05:30
Nabin Hait
eab38cd4eb
Merge branch 'master' into develop
2016-11-03 15:17:39 +05:30
Nabin Hait
9f5f534900
set item rate on first selection of item
2016-11-03 14:54:06 +05:30
Rushabh Mehta
e855f53f08
[minor] fix ellipsis style
2016-11-02 07:34:17 +05:30
mbauskar
be81442c82
[minor] link formatter fixes for Item and Employee
2016-10-27 09:49:22 +05:30
Nabin Hait
72a1943c8e
Fixed version conflict
2016-10-26 16:41:21 +05:30
Rohit Waghchaure
43b508089e
[Fix] Pricing rule discount issue
2016-10-24 16:16:24 +05:30
Nabin Hait
395d757c5a
Fixed merge conflict
2016-10-17 16:42:49 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Rohit Waghchaure
7d5298997b
Documentation for payments
2016-10-06 16:49:39 +05:30
Rohit Waghchaure
b7a5502b97
[Enhancement] Option to make payment via Journal Entry
2016-10-06 12:04:52 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
6c49fa20b5
Fixed precision of rate field
2016-10-05 11:28:02 +05:30
Rushabh Mehta
aedad64445
[minor] fixes
2016-10-04 11:41:42 +05:30
Kanchan Chauhan
b40c0a917d
[WIP] Process Payroll Changes
2016-09-28 15:14:41 +05:30
Nabin Hait
6b4eb7f77f
Fixed version conflict
2016-09-23 12:16:31 +05:30
Rohit Waghchaure
deaee7c08b
[Fix] Additional Discount Amount can't be refresh automatically #6199
2016-09-22 14:02:53 +05:30
Rushabh Mehta
559aa3ab7c
[enhance] show customer, supplier billing and outstanding, fixes #6078
2016-09-19 16:04:58 +05:30
Chude Osiegbu
256ec170d0
Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate
2016-09-19 03:53:37 +01:00
Chude Osiegbu
375a3c003d
Update to erpnext/public/js/controllers/transaction.js in order to enable it detect when the doctype for which exchange rate is to be determined is a Sales Order or Purchase order. If it is either, then use transaction_date instead of posting_date as the argument to get_exchange_rate method
2016-09-19 02:35:32 +01:00
Chude Osiegbu
3c6a937a7c
Merge branch 'develop' into exchange_rate_modifications
2016-09-18 21:47:55 +01:00
Rushabh Mehta
b6bca567ce
[fixes] [style] for web-form
2016-09-13 14:40:13 +05:30
Rohit Waghchaure
60a05324ce
POS changes and fixes
2016-09-12 13:11:10 +05:30
Chude Osiegbu
fbf27b5031
Further corrections to Currency Exchange table
2016-09-07 03:06:08 +01:00
Chude Osiegbu
7be3aa3158
Changes to allow exchange rates on a specific day to be stored in Currency Exchange and to be pulled by the necessary transactions based on the posting date.
2016-09-05 23:35:00 +01:00
Rushabh Mehta
b2f0920346
[minor] new global for query report filters
2016-09-01 17:53:42 +05:30
Nabin Hait
2490ea0b91
Fixed merge conflict
2016-09-01 12:29:31 +05:30
Rohit Waghchaure
d39f53319d
Added zero value condition
2016-08-31 02:09:15 +05:30
Rohit Waghchaure
609e2b4ca3
[POS] Currency format issue
2016-08-31 02:04:53 +05:30
Rohit Waghchaure
a57bf5ee2e
[fix] Precision issue for field conversion rate in POS
2016-08-30 01:05:01 +05:30
Nabin Hait
338e63c448
Fixed version conflict
2016-08-29 11:47:50 +05:30
Rohit Waghchaure
63bdd679d0
[POS] Fixes and cleanup
2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012
Coded column deleted, column added from UI
2016-08-26 14:32:38 +05:30
Nabin Hait
0da75aede3
Fixed merge conflict
2016-08-26 12:40:02 +05:30
Rohit Waghchaure
efb5bf2cfc
[POS] Fixed payment gl entry for sales return
2016-08-25 16:23:47 +05:30
Rushabh Mehta
547dff5d5b
[version] 7.1-beta
2016-08-24 12:44:32 +05:30
Nabin Hait
cfbd0199eb
Merge branch 'master' into develop
2016-08-23 12:10:56 +05:30
Rohit Waghchaure
ea6d7e9b09
[Fix] decimal button not working
2016-08-23 11:39:44 +05:30
Nabin Hait
26f9673ad9
Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements
...
[Enhancement] Multi year financial statements
2016-08-23 11:32:08 +05:30
Rushabh Mehta
3d93ddc606
[fix] docs links
2016-08-22 18:48:04 +05:30
Faris Ansari
3a6155b1b9
add help_links.js
2016-08-22 14:37:22 +05:30
Rohit Waghchaure
26b646f8a3
Added validation for fiscal year
2016-08-21 17:14:12 +05:30
Rohit Waghchaure
713e2b7b62
[POS] Fixed issue of paid amount, write off account
2016-08-19 19:27:16 +05:30
Rohit Waghchaure
4275c30059
[Enhancement] Multi year financial statements
2016-08-19 18:04:32 +05:30
Nabin Hait
6fe3ac49cf
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
...
Allow to edit change amount
2016-08-17 17:08:54 +05:30
Rohit Waghchaure
e4e69ec027
changed field name, validation for change amount account, validation for serial no qty
2016-08-17 16:20:13 +05:30
Rushabh Mehta
185c247286
Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue
...
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 14:25:42 +05:30
Rushabh Mehta
a56121a342
Merge pull request #6034 from netchampfaris/ui-fixes
...
[ui] fix thumbnail for long images in image view frappe/erpnext#1939
2016-08-10 14:24:58 +05:30
Rohit Waghchaure
70be24d6f0
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 13:16:39 +05:30
Rohit Waghchaure
baef2624a2
Given provision to enter write off and change amount on POS
2016-08-10 00:50:53 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +05:30
Faris Ansari
d217387400
[ui] fix thumbnail for long images in image view
2016-08-09 14:15:59 +05:30
Rohit Waghchaure
7127a8f522
Allow user to edit change amount from sales invoice form for is pos
2016-08-08 23:19:18 +05:30
Nabin Hait
3bb1a421f0
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
2016-08-02 16:41:15 +05:30
Rohit Waghchaure
a88dec8775
[Fix] batch no searching in pos
2016-08-01 13:01:13 +05:30
Nabin Hait
981f6ea34e
minor fix for item and employee link formatter
2016-07-31 11:44:43 +05:30
Rushabh Mehta
180e43585f
[minor] formatter for item and employee
2016-07-29 18:52:00 +05:30
Nabin Hait
7bae70a993
[fix] Show supplier name field if it is different from supplier id
2016-07-28 17:19:35 +05:30
akshay
14384c2787
[fix] serial no button
2016-07-28 13:53:17 +05:30
Faris Ansari
8e282c2ed8
[mobile ui] fix pos payment layout #5780
2016-07-24 11:37:25 +05:30
Rohit Waghchaure
ea278b5971
[Fix]POS and timesheet issues
2016-07-22 01:22:56 +05:30
Rushabh Mehta
7e472f898d
[fix] setup wizard
2016-07-21 18:01:42 +05:30
Rushabh Mehta
137e722af1
Merge pull request #5817 from rmehta/neilLasrado-schools
...
Merge schools, fix setup wizard, update domainify
2016-07-21 16:04:22 +05:30
Rushabh Mehta
20038ad2c9
[fixes] setup wizard and domainify for schools;
2016-07-21 16:01:59 +05:30
Rushabh Mehta
b0061c9341
Merge branch 'schools' of https://github.com/neilLasrado/erpnext into neilLasrado-schools
2016-07-21 10:46:32 +05:30
Nabin Hait
ba33026a6b
Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue
...
[Fix] POS auto set paid amount with outstanding amount issue
2016-07-21 09:39:57 +05:30
Rushabh Mehta
5a39d41a0c
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
2016-07-20 22:53:23 +05:30
Neil Trini Lasrado
3f0a581b85
Merge ERPNext Schools into ERPNext
2016-07-20 19:25:02 +05:30
Rushabh Mehta
39077d4210
[dashboard] for quotation and sales order
2016-07-20 18:55:42 +05:30
Rohit Waghchaure
61b4a43d84
[Fix] POS auto set paid amount with outstanding amount issue
2016-07-20 17:01:29 +05:30
Rohit Waghchaure
88514a246b
set paid amount with grand amount on invoice form
2016-07-19 20:04:44 +05:30
Rushabh Mehta
76b134192f
[fix] grid columns now restricted to 10
2016-07-18 14:30:27 +05:30
Rushabh Mehta
55ea7b1f61
[minor] set applicant name automatically
2016-07-15 16:43:25 +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
3ce24d64c2
[cleanup] payment entry form view
2016-07-11 16:08:46 +05:30
Nabin Hait
3950507d4b
[fix] Currency and exchange rate while Quotation made from Opportunity for lead
2016-07-07 11:12:44 +05:30
Rohit Waghchaure
53bea82514
[Fixes] POS amount calculation issue
2016-07-06 16:15:10 +05:30
Anand Doshi
3177138655
[fix] moved disable setup wizard access to frappe
2016-07-05 21:34:21 +05:30
Saurabh
1c5c511d2e
[fix] add payment entry in document flow
2016-07-05 12:46:38 +05:30
Nabin Hait
56548cbfa2
Payment against negative invoice, negative outstanding allocation and much more
2016-07-04 11:42:25 +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
05aefbbf5d
Payment Entry from invoice
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
Saurabh
b35906efc1
[fix] load dependancies on page load event
2016-07-02 17:13:11 +05:30
Saurabh
feefaaf1ee
[fix] Stock Analytics Report page fix
2016-07-01 18:15:17 +05:30
Rushabh Mehta
65256ed8cb
Merge pull request #5526 from KanchanChauhan/shopping-cart-dropdown-update
...
Shopping cart dropdown update
2016-06-29 21:59:29 +05:30
Rushabh Mehta
26a76fb2d9
Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe
...
Newsletter moved to Frappe
2016-06-29 12:11:25 +05:30
Kanchan Chauhan
65c8b5a216
Newsletter moved to Frappe
2016-06-28 17:28:40 +05:30
Kanchan Chauhan
a756e3f765
Reverted changes
2016-06-28 15:02:35 +05:30
Kanchan Chauhan
c8d47da6bc
Shopping cart and dropdown cart update
2016-06-28 11:29:43 +05:30
Saurabh
93d68ac0c2
[fixes] change is group to check box
2016-06-27 17:16:56 +05:30
Saurabh
1702273968
[fix] rename account browser and sales browser to tree/doctype for view
2016-06-25 11:06:14 +05:30
Saurabh
3d6aecd618
[fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin
2016-06-25 11:06:13 +05:30
Rushabh Mehta
6e7dc12fde
Merge pull request #5476 from umairsy/14-jun
...
In the Setup Wizard, changed field label from Bank Account to Bank Name
2016-06-22 12:09:01 +05:30
Rushabh Mehta
2cb7a9f235
[ux] taxes table editable
2016-06-15 16:45:03 +05:30
Rushabh Mehta
a55fb6426c
[patch] mins_to_first_response in opporutnity and issue
2016-06-14 15:54:54 +05:30
Umair Sayyed
9a0ff298ce
Changed field label from Bank Account to Bank Name
2016-06-14 12:25:34 +05:30
Rohit Waghchaure
9fe40d557f
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
2016-06-14 01:11:09 +05:30
Rushabh Mehta
d1eba515e9
[cleanup] fixes to v7
2016-06-13 17:47:13 +05:30
Rushabh Mehta
e0686b32f3
[minor] cleanups
2016-06-10 12:38:52 +05:30
Rushabh Mehta
e778e59e4c
[minor] always show issues in sidebar
2016-06-08 15:34:54 +05:30
Anand Doshi
16e2442278
[cleanup] document flow
2016-06-07 18:55:23 +05:30
Saurabh
a8217dc7e9
[fixes] build json fixes
2016-06-07 17:19:36 +05:30
Saurabh
2966d89e2a
[fixes] create module flow list
2016-06-07 17:19:36 +05:30
Rushabh Mehta
675f9c6e6e
[minor] reset barcode if item is changed, fixes #5314
2016-06-02 16:34:00 +05:30
Rushabh Mehta
aa60fd9037
[fix] new_doc to frappe.new_doc
2016-06-01 11:46:33 +05:30
Rushabh Mehta
bc92824bc4
[minor] rename item_name if same as item, on rename and removed item selector
2016-05-31 07:22:51 +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
Anand Doshi
ac7c81bb98
[fix] compiled erpnext.less to erpnext.css
2016-05-26 16:41:04 +05:30
Nabin Hait
b46d021f2a
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b
Line/Bar chart in Balance Sheet / Profit and Loss statement
2016-05-26 15:26:01 +05:30
Rohit Waghchaure
f2aa1764cc
[POS] enhancement and minor fixes
2016-05-25 15:04:46 +05:30
Rushabh Mehta
ac123c57f3
[cleanup] website / portal css
2016-05-20 16:37:14 +05:30
Nabin Hait
3956c94bbb
Merge pull request #5340 from rohitwaghchaure/support_week_new
...
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-20 12:06:22 +05:30
Anand Doshi
1d88c6a742
[fix] [patch] home page + erpnext.css
2016-05-20 10:42:04 +05:30
Rohit Waghchaure
5d97d89a03
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-17 15:13:17 +05:30
Rohit Waghchaure
e0934d118f
[Fixes] Some changes and fixes
2016-05-16 12:01:16 +05:30
Rushabh Mehta
4b9238a03b
[cleanup] homepage
2016-05-12 15:23:17 +05:30
Rushabh Mehta
d42167e0e5
[cleanup] remove Features Setup
2016-05-11 16:47:14 +05:30
Rushabh Mehta
2dd0581134
[added] domainify.py
2016-05-11 15:14:15 +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
Anand Doshi
969863541d
Merge pull request #5323 from KanchanChauhan/shoppingcart-changes
...
Shopping cart dropdown changes
2016-05-09 16:57:08 +05:30
Kanchan Chauhan
b3573a881e
Shopping cart dropdown changes
2016-05-09 12:30:58 +05:30
Nabin Hait
332d29f166
Merge branch 'master' into develop
2016-05-06 16:13:35 +05:30
Neil Trini Lasrado
728d01945c
redirect issues of erpnext to erpnext repository
2016-05-02 18:37:47 +05:30
Rushabh Mehta
c711b82889
Merge pull request #5296 from KanchanChauhan/websitemakeover
...
New look to the website
2016-05-02 15:54:41 +05:30
Rushabh Mehta
764aa92da4
[minor] added remember_selected in hooks and doc update
2016-05-02 13:28:59 +05:30
Kanchan Chauhan
239b351367
New look to the website
2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Rushabh Mehta
5dfe20ce17
[fix] frappe.require in stock_entry.js
2016-04-26 12:59:08 +05:30
Rushabh Mehta
3d2622ce91
[refacator] added dashboard in item
2016-04-25 17:53:42 +05:30
Anand Doshi
a6f48688bc
[enhancement] website: optionally show products as list
2016-04-22 19:10:49 +05:30
Anand Doshi
e3bd78e912
[css] portal
2016-04-22 18:53:21 +05:30
Kanchan Chauhan
e0818f8f46
Website Changes
2016-04-22 17:47:16 +05:30
Rushabh Mehta
0394aec6a4
[wip] inventory tool
2016-04-22 17:22:22 +05:30
Rushabh Mehta
621283c5c5
[enhancement] stock balance page
2016-04-21 19:00:34 +05:30
Rushabh Mehta
cd3c979207
[cleanup] website.less
2016-04-21 13:09:41 +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
Kanchan Chauhan
2dbf5294a9
[WIP] No not merge
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
Saurabh
4bd34a58ba
[fixes] fix perpetual inventory
2016-04-18 15:57:55 +05:30
jof2jc
524ebbcbb9
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
2016-04-18 15:57:55 +05:30
Rushabh Mehta
a305c29b0e
[cleanup] remove is_pro_applicable
2016-04-15 15:03:16 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Rushabh Mehta
8c9c57c8f3
[minor] update party timestamp after transaction
2016-04-13 18:22:06 +05:30
Nabin Hait
1ce6df8ff6
Merge pull request #5203 from nabinhait/credit_limit_fix
...
[fix] Ignore closed sales order in credit limit validation
2016-04-13 15:36:33 +05:30
Nabin Hait
7132bd3659
[fix] Ignore closed sales order in credit limit validation
2016-04-13 15:19:37 +05:30
Nabin Hait
09855fc3cc
Merge pull request #5158 from neilLasrado/hotfix
...
Removed education as a domain in ERPNext setup wizard
2016-04-13 12:05:11 +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
Rushabh Mehta
5d0e8dee11
[fix] dashboard for customer, supplier
2016-04-11 17:34:49 +05:30
Rohit Waghchaure
b2e7a1f605
[Fix] Default letter head
2016-04-11 17:30:44 +05:30
Anand Doshi
2f957f27b0
[fix] apply Tax Rule for lead
2016-04-08 17:43:08 +05:30
Rushabh Mehta
203cc962f5
[enhancement] Item Selector
2016-04-08 17:21:00 +05:30
Neil Trini Lasrado
ce893499d7
Removed education as a domain in ERPNext setup wizard
2016-04-08 16:52:53 +05:30
Rushabh Mehta
78b7a53635
[cleanup] set default bold, print_hide for prints
2016-04-06 15:29:45 +05:30
Kanchan Chauhan
7379fd4b9a
POS Search Fixed
2016-04-04 14:39:29 +05:30
Rushabh Mehta
bb8c6de043
[opt] transaction.js
2016-03-29 17:52:22 +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
c79415eb96
added rate and total margin in price_list
2016-03-24 14:07:49 +05:30
Nabin Hait
68a628ea1e
[fix] set recurring id after saving
2016-03-21 12:03:30 +05:30
rohitwaghchaure
cef1086441
[fix]Letterhead not being changed with change in company
2016-03-18 15:37:24 +05:30
Nabin Hait
6221117069
[fix] shipping address position in document
2016-03-16 16:23:30 +05:30
Saurabh
14d646f636
[fixes] shipping address on purchase flow
2016-03-16 16:23:30 +05:30
shreyas
77d23824df
[Partial]Some more changes to enable shipping address to be displayed in PO
2016-03-16 16:23:29 +05:30
shreyas
22d26a1d82
[Partial] Fix to add Shipping address in Purchase order
2016-03-16 16:23:29 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +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
Anand Doshi
0179242f04
[fix] [hot] setup wizard domain
2016-03-09 16:32:13 +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
Neil Trini Lasrado
1b03e0a6d0
Added Other as a Domain in Company/setup wizard
2016-03-08 20:22:24 +05:30
Neil Trini Lasrado
342895c9df
Added Domain to setup wizard
2016-03-08 19:55:57 +05:30
Anand Doshi
b073cf4fa1
[fix] POS amount_paid when not cash - Fixes #4686 , #4828 , #4289
2016-03-08 17:59:19 +05:30
Rushabh Mehta
756e518bc1
[fix] recurring
2016-03-03 13:00:30 +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
4403853828
[minor] fix notification for material request, splash icon, cleanup project form layout
2016-02-27 16:24:34 +05:30
Neil Trini Lasrado
3c0d5cbab5
Fixes in Setup Wizard
2016-02-24 18:02:08 +05:30
saurabh
f703198082
replaced methd
2016-02-23 02:17:03 +05:30
saurabh
533a0f6527
created new file
2016-02-23 02:17:03 +05:30
Anand Doshi
561e6cd27b
[fix] Trial Balance to General Ledger: use data.from_date and data.to_date
2016-02-16 11:56:53 +05:30
Anand Doshi
39a289145c
[fix] fetch price list rate
2016-02-15 11:42:18 +05:30
Rushabh Mehta
eab1671214
[fix] [pos] refresh party field, fixes #4789
2016-02-11 18:35:59 +05:30
Nabin Hait
ef864403a1
[fix] call get_party_account only if party is set
2016-02-10 14:47:25 +05:30
Rushabh Mehta
8d1c7a2524
[fix] call get_party_account only if party is set
2016-02-10 13:08:42 +05:30
Nabin Hait
a731ad4433
[fix] Set party account on chnage of company
2016-02-04 17:22:57 +05:30
Nabin Hait
bd7f48cfd4
[report] Financial Statements: Accumulated periodic balance based on filters
2016-02-02 19:05:43 +05:30
ShashaQin
539a826b37
Update financial_statements.js
...
Adding Accumulated Values check box on Profit and Loss, Balance Sheet
2016-02-02 19:05:42 +05:30
Anand Doshi
afe85bdd04
[hotfix] use me.frm.doc in get_item_details
2016-01-21 21:04:16 +05:30
Nabin Hait
0d207706c1
[fix] Get item details
2016-01-21 18:47:09 +05:30
Nabin Hait
fb0b24af78
Rounding based on smallest circulating currency fraction value
2016-01-20 17:07:35 +05:30
Nabin Hait
d4507ac6a0
[fix] Round off gle due to currency conversion
2016-01-20 16:14:27 +05:30
Nabin Hait
8b63b1221f
Calculate change in POS based on smallest currency fraction value
2016-01-18 17:56:55 +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
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Rushabh Mehta
986f6a71ec
[minor] fix new customer link in POS
2016-01-14 18:15:56 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Saurabh
3ade883fd9
[fixes] place cart button via js
2016-01-12 14:09:52 +05:30
Saurabh
403ad48364
[fixes] display cart count only if item exist in cart
2016-01-12 14:09:52 +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
Anand Doshi
d8ac0f3df7
[fix] removed duplicate 'region' section as it is already in Frappe Framework
2016-01-11 18:22:02 +05:30
Raul Viveros
1d5f8d4436
fix button "Edit" encode url in address and contact template
2016-01-09 22:18:14 +01:00
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
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Anand Doshi
2af44ffd06
[fix] setup wizard is_private
2015-12-09 17:29:11 +05:30
Anand Doshi
70f57eb7f0
[fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table
2015-11-27 14:38:01 +05:30
Anand Doshi
a4870118ea
Merge pull request #4365 from anandpdoshi/fix/print-hide-if-0
...
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
2015-11-25 17:28:54 +05:30
Anand Doshi
5c968abcef
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
2015-11-25 16:33:00 +05:30
Anand Doshi
5c3469a01e
[fix] validate fiscal year dates and company name
2015-11-24 17:06:54 +05:30
Nabin Hait
e8f4790d0a
[hotfix]
2015-11-16 18:10:15 +05:30
Nabin Hait
adc93b797a
Merge pull request #4316 from nabinhait/advance_fix
...
[fix] Invoice Outstanding calculation related to advance
2015-11-16 15:50:32 +05:30
Anand Doshi
1ed82834ce
[fix] re-make setup wizard slides on change of language
2015-11-16 12:58:14 +05:30
Nabin Hait
90c6d7bb47
[fix] Invoice Outstanding calculation related to advance
2015-11-13 14:04:03 +05:30
Rushabh Mehta
37b4d75e4a
[re-org] setup wizard in frappe
2015-11-12 11:45:47 +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
Rushabh Mehta
b1d8979a59
Merge pull request #4179 from saurabh6790/drop-shipping
...
Drop shipping
2015-11-02 15:43:48 +05:30
Nabin Hait
915778fb69
[fix] Clear addressed and contacts on a new form
2015-10-30 14:43:13 +05:30
Anand Doshi
b0388d971a
[minor] reduced size of video placeholder
2015-10-30 12:54:10 +05:30
Saurabh
2e65aadb1e
[fixes] reload doc after status update and supplier address fetching
2015-10-29 19:43:35 +05:30
Saurabh
8a8ef85174
[fixes] reviwe fixes
2015-10-29 19:43:33 +05:30
Saurabh
c306b21415
[merge fixes]
2015-10-29 19:43:31 +05:30
Anand Doshi
7dab3c1f85
Show Welcome to ERPNext after completing Setup Wizard
2015-10-29 15:32:00 +05:30
Nabin Hait
bdfb070ed6
[fix] Serial No query in Warranty Claim
2015-10-28 15:38:22 +05:30
Nabin Hait
83e68bb837
minor fix
2015-10-26 17:40:31 +05:30
Nabin Hait
00818bfa90
Set tax rule based on date
2015-10-23 16:26:09 +05:30
Anand Doshi
87da662703
[enhancement] Quick Entry in Journal Entry, remember Posting Date
2015-10-21 16:27:13 +05:30
Nabin Hait
aa015902d5
Validate currency of default receivable/payable accounts
2015-10-19 15:10:11 +05:30
Rushabh Mehta
80d2a55342
[enhancement] add variants in website
2015-10-14 16:16:00 +05:30
Anand Doshi
9a4d165ba2
[fix] get_party_details.js - set posting_date if args are initialised
2015-10-12 16:23:51 +05:30
Anand Doshi
19a33994da
[cleanup] removed desk_home and desk_home_flows from conf.js
2015-09-29 20:06:22 +05:30
Anand Doshi
142859f36e
Merge pull request #4076 from anandpdoshi/shopping-cart-order
...
check doc.has_website_permission in order.html. Merge after frappe/frappe#1316
2015-09-28 19:40:17 +05:30
Rushabh Mehta
7f75dbf061
[cleanup] remove backup manager
2015-09-28 19:12:54 +05:30
Anand Doshi
199d8a44fc
[fix] check doc.has_website_permission in order.html
2015-09-28 19:04:42 +05:30
Anand Doshi
06ad308ca1
[fixes] setup wizard and other fixes related to cart
2015-09-23 12:50:35 +05:30
Rushabh Mehta
8ffd483e24
[wip] shopping cart shipping rule, price list cleanup
2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2
[cleanup] [wip] portal, shopping cart cleanup
2015-09-23 12:49:16 +05:30
Neil Trini Lasrado
09f9c96c53
Fixes in Tax Rule
2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609
Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions
2015-09-15 15:41:00 +05:30
Nabin Hait
bac9b8eef6
Payment Tool changes due to multi currency
2015-08-31 19:01:11 +05:30
Nabin Hait
13d8835b75
Fixed merge conflict
2015-08-27 14:55:34 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
Rushabh Mehta
00eba4d7f6
[minor] show price list in sales order (via support ticket)
2015-08-27 10:25:07 +05:30
Rushabh Mehta
b8a6f40370
[cleanup] layouts of item, customer, supplier, lead
2015-08-26 10:51:45 +05:30
Rushabh Mehta
f24f6044bd
[layout] cleaned up Sales Invoice
2015-08-26 10:51:44 +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
ad9156a6ae
[enhancement] POS print after save #385:wq:wq
2015-08-18 18:05:43 +05:30
Nabin Hait
6ddcac7cee
minor fix
2015-08-13 11:47:35 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Neil Trini Lasrado
dde65752b6
Fixed code to consider partial FG entry
2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
845980c010
Added Feature - Update FG based on Material Transfer For Manufacturing
2015-08-10 19:14:43 +05:30
Rushabh Mehta
147acfd502
[fix] [mobile] abs url erpnext icon
2015-08-05 14:49:32 +05:30
Rushabh Mehta
a208c56813
[enhancement] auto insert item price if missing, #3533
2015-08-04 14:48:52 +05:30
Nabin Hait
b7c0c55d61
Validate serial no in return entry with against document
2015-08-04 12:18:12 +05:30
Nabin Hait
db53a789be
[fix] Tax calculation while discount applied on net total
2015-08-03 19:10:59 +05:30
Nabin Hait
9e26bcfeeb
[fix] Actual tax amount should be negative while creating return entry
2015-07-30 11:48:18 +05:30
Nabin Hait
1e046aa49a
Hide buttons for return entry
2015-07-29 13:16:37 +05:30
Nabin Hait
1d21842f68
Sales / Purchase Return redesigned via negative DN / SI / PR / PI
2015-07-24 13:26:53 +05:30
Anand Doshi
906c2babaa
[ui] Show ERPNext icon instead of ERPNext in navbar
2015-07-17 15:14:39 +05:30
Anand Doshi
5e849ae53e
[help] added new links to Learn
2015-07-15 15:23:02 +05:30
Rushabh Mehta
2b49f9b30a
[fix] pos default payment #3631
2015-07-14 11:01:42 +05:30
Neil Trini Lasrado
fe2ffaeafa
Fixes in Production Planning Tool
2015-07-13 12:41:28 +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
40e92b679b
Posting date trigger function commonified
2015-07-09 17:12:23 +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
75b00e3958
Mode of Payment added to POS Profile
2015-07-08 14:43:47 +05:30
Neil Trini Lasrado
e2d8dd0663
added recurring print format to sales/purchase invoice and order
2015-06-29 12:50:41 +05:30
Neil Trini Lasrado
d015195617
fixes in barcode
2015-06-09 15:21:50 +05:30
Neil Trini Lasrado
b2f550ccb3
Barcode added to Purchase Receipt
2015-06-09 15:18:58 +05:30
Nabin Hait
995a78421a
[fix] Stock analytics report fixed for fifo stack related to stock reco
2015-06-03 16:44:26 +05:30
Rushabh Mehta
95b995be6d
[minor] set timezone in posting time and added help
2015-05-28 12:10:55 +05:30
Nabin Hait
86e479f908
Merge pull request #3355 from rmehta/purchase-invoice-fixes
...
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:19:22 +05:30
Rushabh Mehta
c185734bf3
[minor] remove letter head / terms from purchase invoice, fixes #3328 , #3345
2015-05-28 11:17:22 +05:30
Rushabh Mehta
beb7c346ea
[fix] [cleanup]
2015-05-28 11:12:29 +05:30
Rushabh Mehta
88655890be
[fix] [refactor] pos hangs in multi-company, if company is not set
2015-05-28 11:11:25 +05:30
Anand Doshi
81bded1afe
[fix] Product Search
2015-05-27 16:48:06 -04:00
Nabin Hait
eb00cae86c
Fiscal Year removed from Material Request
2015-05-27 13:18:09 +05:30
Nabin Hait
093beecd0a
minor fix
2015-05-26 12:15:39 +05:30
Rushabh Mehta
822fd7747a
[email] [website] footer cleanup
2015-05-26 12:15:39 +05:30
Rushabh Mehta
f29a618b69
[email] [website] footer cleanup
2015-05-26 12:15:39 +05:30
Nabin Hait
f3ae85cc9a
Merge pull request #3313 from rmehta/material-request-fix
...
[fix] load taxes_and_charges only if field present
2015-05-21 13:22:21 +05:30
Rushabh Mehta
4984bccbc6
[fix] load taxes_and_charges only if field present
2015-05-21 12:51:07 +05:30
Rushabh Mehta
a27cca97b5
[rename] POS Setting > POS Profile #3271
2015-05-20 15:43:17 +05:30
Nabin Hait
8252117fe5
set tax amount also in base currency after manipulation
2015-05-19 16:30:17 +05:30
Nabin Hait
f59d3a4e07
conversion rate fixes
2015-05-19 16:30:16 +05:30
Rushabh Mehta
5495bc54a5
[enhancement] default terms in company, fixes #3231
2015-05-19 13:03:01 +05:30
Pratik Vyas
1a84d8ecd2
Merge branch 'develop'
2015-05-19 12:23:52 +05:30
Rushabh Mehta
4a3c805049
[fix] sms settings, fixes #3276
2015-05-19 11:10:12 +05:30
Nabin Hait
a6ee8290ce
Inclusive tax for deduction and manipulation of tax amount to fix rounding issue
2015-05-15 12:02:27 +05:30
Nabin Hait
ffc7f3fef6
Apply default taxes on loading of document
2015-05-12 15:07:02 +05:30
Nabin Hait
ec361ea648
exchange rate fix
2015-05-11 18:14:45 +05:30
Nabin Hait
dd82bf2ad9
Exchange rate issue fixed
2015-05-11 16:49:31 +05:30
Rushabh Mehta
66fa1ff878
[enhancement] automatic exchange rates via jsonrates
2015-05-07 12:26:09 +05:30
Nabin Hait
0e1540b3b7
material request saving issue fixed
2015-05-05 17:26:35 +05:30
Nabin Hait
2b3e065efc
[fix] taxes and charges input value
2015-05-05 16:33:58 +05:30
Nabin Hait
61092c0a88
Pos item view: show item name and item code
2015-05-05 12:27:11 +05:30
Nabin Hait
c91a9e5231
Delete company and company transactions are separate functions
2015-05-04 11:51:21 +05:30
Rushabh Mehta
c712cdb580
[fix] tax with both actual and rate type
2015-05-03 22:20:56 +05:30
Nabin Hait
f550ecf93e
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:42 +05:30
Nabin Hait
69cdf59d63
Maintain same currency exchnage rate while mapping
2015-05-02 18:46:29 +05:30
Nabin Hait
5207d1205e
minor issue fixed for precision
2015-04-29 15:38:14 +05:30
Rushabh Mehta
45ca8a4d31
[minor] save last company in multi-company scenario
2015-04-28 16:04:56 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Rushabh Mehta
50918a8fcf
[pos] fixes #3138 , #3140
2015-04-21 14:38:48 +05:30
Rushabh Mehta
5674c4f28c
[splash] new image
2015-04-16 15:09:42 +05:30
Rushabh Mehta
d64e928b50
[favicon] darker
2015-04-16 14:04:51 +05:30
Rushabh Mehta
2e7c36ec99
[favicon] light grey for erpnext
2015-04-16 12:41:42 +05:30
Nabin Hait
3c89605e57
minor fix in taxes and totals
2015-03-23 14:33:22 +05:30
Anand Doshi
2b2b639492
fixes
2015-03-20 14:29:23 +05:30
Neil Trini Lasrado
3d61bbb36a
fixes in get_serial_number function
2015-03-18 11:04:32 +05:30
Nabin Hait
a1bf43b1a6
Merged develop into v5
2015-03-17 10:50:47 +05:30
Anand Doshi
d6822ddd7c
manipulate grand total for inclusive tax
2015-03-13 18:23:10 +05:30
Rushabh Mehta
f5f0d5a83a
[breadcrumbs] refactor
2015-03-09 15:48:16 +05:30
Nabin Hait
e2f054cc27
transaction date issue in pricing rule fixed
2015-03-09 14:54:37 +05:30
Anand Doshi
e514323be4
load all js and css like before in desk.html
2015-03-06 13:17:26 +05:30
Rushabh Mehta
c4dce99f4b
[fixes] pos #2830 , #2795
2015-03-05 15:09:04 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Rushabh Mehta
b83fa3bc2d
[pos] [barcode] fixes #2831
2015-03-02 18:25:14 +05:30
Rushabh Mehta
8c84fca182
[fix] #2875
2015-03-02 16:29:56 +05:30
Anand Doshi
16018dd474
removed erpnext splash
2015-03-01 21:16:44 +05:30
Nabin Hait
86cd4cc739
discount related fix
2015-02-28 19:12:55 +05:30
Nabin Hait
b7ae9b4283
Merge pull request #2866 from neilLasrado/barcode
...
Barcode added to stock entry
2015-02-27 11:35:07 +05:30
Anand Doshi
8f9e631a44
minor fixes
2015-02-26 20:29:43 +05:30
Neil Trini Lasrado
4374692cf5
fixes
2015-02-25 19:01:17 +05:30
Rushabh Mehta
2a21bc9fc2
[taxes and charges] refactor
2015-02-25 15:08:57 +05:30
Anand Doshi
28d21ba3c0
[minor] fix build.json
2015-02-24 22:28:26 +05:30
Anand Doshi
da858cc587
Website Product Image
2015-02-24 17:52:09 +05:30
Nabin Hait
93b3a37a3b
rounding issue and rate trigger
2015-02-24 17:08:51 +05:30
Nabin Hait
72c359afa2
valuation type charges can not be inclusive
2015-02-24 16:05:19 +05:30
Nabin Hait
903c42a130
multiplefixes
2015-02-24 15:24:49 +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
f0bc9b6d3a
Renamed Net total to Total and dynamic label
2015-02-24 10:02:27 +05:30
Nabin Hait
755ff60313
tax amount conversion in client side printing
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
614e7ab757
[cleanup] SMS, and added item filter in stock balance
2015-02-18 19:51:48 +05:30
Nabin Hait
7c28fc4014
Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0
2015-02-18 12:24:49 +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
46e03eadca
[rename] Customer Issue -> Warranty Claim
2015-02-17 10:45:50 +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
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
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +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
Anand Doshi
dea3fb0d64
[fix] call calculate code only once after applying pricing rule
2015-02-05 15:06:16 +05:30
Anand Doshi
dd942bb3d2
[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists
2015-02-04 18:53:24 +05:30
Rushabh Mehta
c567e8e960
[fix] analytics reports + remove print item tables #2667
2015-02-03 17:56:25 +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
Anand Doshi
aff9a59f2d
[minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log
2015-01-29 19:49:34 +05:30
Nabin Hait
d41f3c1f5e
All the calculations in taxes_and_totals file
2015-01-23 16:24:49 +05:30
Nabin Hait
b4a3dfa893
All the calculations in taxes_and_totals file
2015-01-22 17:13:13 +05:30
Anand Doshi
88a1515b46
[minor] ERPNext as navbar-home
2015-01-21 18:25:04 +05:30
Nabin Hait
963393409e
minor fix: child table length
2015-01-21 17:22:11 +05:30
Anand Doshi
f02e142d5d
[design] mobile
2015-01-19 15:59:45 +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
Neil Trini Lasrado
0866272ba1
get fiscal year fix
2015-01-12 16:41:55 +05:30
Rushabh Mehta
135fe3405f
[ui] listviews
2015-01-12 16:11:02 +05:30
Anand Doshi
50d7e8cf8f
[design] Point of Sale
2015-01-06 17:14:26 +05:30
Anand Doshi
9b955feff8
[design] POS - item grid and taxes
2015-01-05 16:19:12 +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
7a8f009116
[fixes]
2014-12-31 15:34:37 +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
Rushabh Mehta
afbfdcf552
[ui] minor fixes
2014-12-30 18:11:32 +05:30
Nabin Hait
54c31b498b
Fixes in Stock Analytics
2014-12-30 16:33:07 +05:30
Nabin Hait
7d8fa8089a
always calculate taxes and totals onchange of exchange rate
2014-12-30 15:35:59 +05:30
Nabin Hait
dd38a266b8
Removed tname and fname from code
2014-12-26 13:15:21 +05:30
Rushabh Mehta
a5b149c061
[design] module pages, messages, timelines
2014-12-26 12:53:02 +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
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Neil Trini Lasrado
31a92bd9d9
company wise letter head feature added
2014-12-23 17:52:41 +05:30
Nabin Hait
cfe3c54ca0
Dont reset pricing if ignore pricing rule
2014-12-22 10:43:10 +05:30
Nabin Hait
49a2729663
Reapply price list if pricing rule reset as blank
2014-12-17 11:24:00 +05:30
Nabin Hait
b072c74efc
render address and contacts for party
2014-12-16 12:49:13 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
ankitjavalkarwork
9269c86339
Display mobile no of contact
2014-11-27 17:13:36 +05:30
Rushabh Mehta
0a7abc188e
[minor] [ux] contact template
2014-11-24 15:06:40 +05:30
Rushabh Mehta
5eeef7f065
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:51 +05:30
Rushabh Mehta
7d36875d6f
[refactor] address and contact list in customer, supplier, lead, sales person
2014-11-24 14:16:47 +05:30
Neil Trini Lasrado
2c388f9d7e
POS feature #2305
2014-11-11 16:00:09 +05:30
Nabin Hait
ae1dcabcb5
Fixed merge conflict
2014-11-05 12:41:02 +05:30
Nabin Hait
28913b97b0
[fix] Null issue fixed in stock analytics report
2014-10-31 14:46:25 +05:30
Rushabh Mehta
3daa49ac1f
[shopping-cart] i'm back
2014-10-21 16:16:30 +05:30
Rushabh Mehta
be1a8d82c5
[merge] develop
2014-10-21 13:14:55 +05:30
Neil Trini Lasrado
eaae58f507
Transaction.js fixed , code commonified
2014-10-09 15:01:13 +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
Neil Trini Lasrado
78fa6954e5
Fiscal year autofetch added
2014-10-09 15:01:12 +05:30
Nabin Hait
e96e83d557
stock reco and repost vouchers
2014-10-08 18:06:14 +05:30
Nabin Hait
b96c014daf
Stock Reconciliation logic simplified
2014-10-08 11:02:18 +05:30
Nabin Hait
b783f519ee
Fixes in sales/purchase invoice trends report
2014-09-26 14:23:00 +05:30
Anand Doshi
1394509343
Fixes for recurring document
2014-09-21 19:45:49 +05:30
81552433qqcom
6d02939256
changed indent. as well use tab instead of space.
2014-09-12 16:22:28 +05:30
81552433qqcom
e3b63f2d9c
added __() for options that need label.
2014-09-12 16:07:12 +05:30
81552433qqcom
1c440b3b31
month options doesn't get translated.
2014-09-12 16:07:12 +05:30
Neil Trini Lasrado
ad24069cdc
[fix] issue 448 final
2014-08-26 16:30:39 +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
4417529952
Packing list visibility issue
2014-08-21 16:44:32 +05:30
Nabin Hait
0a35effe49
Precision issue in tax calculation
2014-08-19 13:22:19 +05:30
Rushabh Mehta
ab8bde0149
[ux] added folds, show actual / projected qty in pos
2014-08-14 11:43:46 +05:30
Rushabh Mehta
23607f91cd
[fix] [pos] pos view only for draft docs
2014-08-08 17:29:16 +05:30
Rushabh Mehta
72e1719220
added icon for pos
2014-08-08 15:43:26 +05:30
Rushabh Mehta
995185d02d
[ux] fixed primary action
2014-08-08 11:51:23 +05:30
nabinhait
b739264243
Don't run company trigger on amendment
2014-07-28 16:41:33 +05:30
Anand Doshi
39edcbc93b
[minor] apply pricing rule / price list only if item_code
2014-07-28 16:00:19 +05:30
Anand Doshi
cb86d597b7
Report: Trial Balance
2014-07-22 19:49:16 +05:30
Anand Doshi
5f0459c321
Fixes to Financial Statements
2014-07-21 16:13:06 +05:30
Anand Doshi
825d014616
Commonfied code for Financial Statements and added Profit and Loss Statement
2014-07-21 11:43:18 +05:30
Anand Doshi
f214bfcfc3
Fixes in load defaults of transaction.js
2014-07-16 17:53:02 +05:30
nabinhait
d5fd535909
Minor fix, if no default company
2014-07-14 12:39: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
nabinhait
bc408d8d0b
Run trigger of company field on onload function, even if company exists
2014-07-07 17:56:24 +05:30
Anand Doshi
51f722d20f
Trigger Apply Price List on change of Currency Conversion Rate or Price List Currency Conversion Rate
2014-07-04 15:44:49 +05:30
Anand Doshi
dffec8fb85
Reapply Price List on Change
2014-07-04 15:44:48 +05:30
Anand Doshi
610a405c85
Fix in warehouse query
2014-06-25 13:30:26 +05:30
Anand Doshi
faefeaa644
Warehouse query filtered by company
2014-06-24 18:53:04 +05:30
Nabin Hait
444f956e7b
Pricing Rule fixes and improvements. Fixes #1795
2014-06-20 16:00:45 +05:30
Nabin Hait
4d7c4fc0f4
Get party details fixes
2014-06-18 16:40:59 +05:30
Anand Doshi
205438669a
Removed clear_custom_buttons, pos view switch fix
2014-06-12 15:00:51 +05:30
Anand Doshi
8cead48342
Merge pull request #1756 from rmehta/develop
...
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-06 14:52:22 +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
Nabin Hait
b7438894f6
Fixes in trends report
2014-06-05 17:55:00 +05:30
Anand Doshi
221dec8cac
transaction.js: calculate only if one entry in table
2014-06-04 17:48:57 +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
Nabin Hait
51b7f322cc
Closing balance fixes in trial balance. Fixes #1730
2014-06-02 18:47:46 +05:30
Nabin Hait
c1367d9d10
minor fixes
2014-05-30 11:43:00 +05:30
Nabin Hait
a3dd72a759
Pricing Rule
2014-05-30 11:22:10 +05:30
Rushabh Mehta
1bf9df7c85
removed about
2014-05-28 13:15:32 +05:30
Rushabh Mehta
f944e819e9
fixes #1581 and added icons to grid reports
2014-05-27 15:22:04 +05:30
Nabin Hait
03f3a8a2ef
Get taxes and charges records from matser. Fixes #1634
2014-05-13 16:38:31 +05:30
Nabin Hait
053a87edf6
Merge branch 'develop' of github.com:frappe/erpnext into develop
2014-05-02 17:37:38 +05:30
Nabin Hait
bc83b9c1ac
minor fix
2014-05-02 17:03:18 +05:30
Anand Doshi
b71a18cd1e
Leave Allocation Tool and Employee. Fixes #1555
2014-05-02 16:23:51 +05:30
Nabin Hait
6b03914731
asynchronus issue in get_party_details
2014-05-02 15:45:10 +05:30
Anand Doshi
cd17bdffcd
Fixes in account query, fiscal year and cost center
2014-04-28 20:34:48 +05:30
Anand Doshi
8bde7f9b3a
Conditionally toggle Naming Series. Fixes #1526
2014-04-24 18:11:49 +05:30
Anand Doshi
78eeacb53c
Fixes in Lead, Opportunity, Quotation, Setup Wizard
2014-04-23 19:15:15 +05:30
Anand Doshi
b054eb7a4f
Call calculate_taxes_and_totals after mapping
2014-04-22 20:35:22 +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
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
8a40c136ce
more message fixing
2014-04-15 16:31:20 +05:30
Anand Doshi
5d4ffa6cf8
Fixed splash.svg
2014-04-15 13:09:09 +05:30
Pratik Vyas
b52618c142
frappe._ to __
2014-04-14 16:25:30 +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
b5e6d7e171
Account balance in debit and credit columns in trial balance and financial analytics report
2014-03-21 11:26:09 +05:30
Nabin Hait
73083dc960
Fix related to user_default
2014-03-21 11:26:08 +05:30
Nabin Hait
2b57ecbd6c
fixes for debit_or_credit in account tree grid report
2014-03-21 11:22:38 +05:30
Anand Doshi
2134d24b36
Removed cloud subscription logic
2014-03-14 15:24:57 +05:30
Rushabh Mehta
7c932003ed
rename Profile to User frappe/frappe#470
2014-03-11 16:15:59 +05:30
Rushabh Mehta
6fbda08583
fixed sitemap patch
2014-02-20 19:03:03 +05:30
Nabin Hait
0f2310690e
fix in fetch item details and supplier non-mandatory to fetch
2014-02-20 11:27:47 +05:30
Nabin Hait
9d1f077922
get lead details in quotation
2014-02-19 17:43:24 +05:30
Nabin Hait
05b28eb161
minor fixes
2014-02-19 11:04:32 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Nabin Hait
139dc7b9b2
minor fixes
2014-02-12 14:54:16 +05:30
Nabin Hait
1eb560130a
Rename fields: amount related fields
2014-02-12 14:54:14 +05:30
Nabin Hait
7979f7ed21
Field Rename: rate field mass replacement
2014-02-12 14:54:14 +05:30
Nabin Hait
a7f757a3f4
Rename fields: initial commit
2014-02-12 14:54:13 +05:30
Rushabh Mehta
4b41e420c0
cleaned up splash:
2014-02-06 11:02:53 +05:30
Rushabh Mehta
cc008cc109
commonified get_party_details
2014-02-03 16:14:56 +05:30
Rushabh Mehta
347889b233
merge
2014-02-03 14:49:53 +05:30
Rushabh Mehta
8612778136
style fix
2014-02-03 10:45:21 +05:30
Akhilesh Darjee
e0a1039756
merge conflict fixed
2014-01-30 14:44:35 +05:30
Akhilesh Darjee
4cdb79941b
map charge to taxes and charges in transactions
2014-01-30 13:56:57 +05:30
Nabin Hait
0ff32e73ba
Merged with 4.0.0-wip
2014-01-30 12:41:52 +05:30
Nabin Hait
fe8db590a1
Fixed conflict while merging with develop
2014-01-30 12:32:47 +05:30
Nabin Hait
b87e9f2651
Fixes in fetching party details
2014-01-29 19:51:36 +05:30
Akhilesh Darjee
4f7215662d
webnotes/erpnext#1090 set default tax type in customer and supplier
2014-01-29 16:31:38 +05:30
Rushabh Mehta
24da761a17
more updates to party
2014-01-29 15:26:04 +05:30
Rushabh Mehta
49dd7bee87
added get_supplier_details and commonified invoice functions
2014-01-28 17:43:10 +05:30
Nabin Hait
21d324c597
Merged with 4.0-wip
2014-01-28 15:52:25 +05:30
Rushabh Mehta
7460dcf406
updated Bootstrap
2014-01-22 12:44:46 +05:30
Nabin Hait
5c6d13a0df
Fixed conflict while merging with develop branch
2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a
Fixed conflict while merging with develop brnach
2014-01-20 16:48:49 +05:30
Akhilesh Darjee
e27717261d
merge conflict fixed
2014-01-03 18:18:31 +05:30
Akhilesh Darjee
57738a0ff3
flat discount replaced to discount amount
2014-01-03 18:15:07 +05:30
Rushabh Mehta
b09d9dabc5
started cleanup of address / contact calls - partly fixed for customer, to fix shipping_address, get_pos_values, for all supplier transactions
2014-01-02 11:47:23 +05:30
Anand Doshi
9a4a13cb73
Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes
2013-12-31 17:38:21 +05:30
Akhilesh Darjee
d203aea7c2
[flat discount] flat discount implemented on sales cycle
2013-12-27 17:49:57 +05:30
Rushabh Mehta
54047780fc
Merge with 3.3.8
2013-12-26 11:07:46 +05:30
Rushabh Mehta
2b08985e16
Translations redesigned webnotes/wnframework#351
2013-12-19 18:27:48 +05:30
Rushabh Mehta
6de403f2be
added manifest, hooks and fixed requires webnotes/wnframework#351
2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d
install, web serving, session booting webnotes/wnframework#351
2013-12-12 19:12:19 +05:30
Pratik Vyas
1b23208779
[minor] get bundle working, almost
2013-12-12 10:44:38 +05:30
Rushabh Mehta
afea58b7a1
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30
