Nabin Hait
b3d4326dcc
Revert "Prompt for mandatory batch number in POS ( #8928 )"
...
This reverts commit ce9ac7885e
2017-05-24 17:33:07 +05:30
Charles-Henri Decultot
ce9ac7885e
Prompt for mandatory batch number in POS ( #8928 )
...
* Prompt for mandatory batch number in POS
* Whitespaces correction
2017-05-24 17:29:23 +05:30
Nabin Hait
258f7da778
Paid amount + Write Off Amount can not be greater than Grand Total in return POS
2017-05-24 17:12:07 +05:30
Nabin Hait
24f0b13b22
Total unpaid amount in party is based on GLE
2017-05-24 16:46:56 +05:30
Nabin Hait
2d79a641c2
Annual billing amount in party dashboard based on grand total
2017-05-24 16:46:56 +05:30
Makarand Bauskar
3b9c2a4438
Added a reference of Sales Invoice in Serial No ( #8855 )
...
* [enhance] added Sales Invoice reference in Serial Number
* [patch] added test cases for Sales Invoice and added patch to copy sales invoice
* [minor] minor fixes in validate_serial_against_delivery_note
* [minor] fixes in sales invoice serial number validation
2017-05-23 18:45:34 +05:30
Nabin Hait
dce8dfc4fe
Merge branch 'master' into develop
2017-05-23 17:48:43 +05:30
Makarand Bauskar
724cc35421
[minor] added columns to pos print_template ( #8978 )
2017-05-23 17:43:42 +05:30
Nabin Hait
c9f5d84742
Merge branch 'master' into develop
2017-05-23 17:16:19 +05:30
Faris Ansari
29d64cae34
POS print format fix ( #8973 )
2017-05-23 17:12:51 +05:30
Rushabh Mehta
2b06633919
Merge branch 'master' into develop
2017-05-19 19:24:43 +05:30
rohitwaghchaure
177a26849d
[fix] Trial balance not working ( #8937 )
2017-05-19 18:56:25 +05:30
Charles-Henri Decultot
8bec0239b9
Prompt for mandatory batch number in POS ( #8928 )
...
* Prompt for mandatory batch number in POS
* Whitespaces correction
2017-05-19 16:02:30 +05:30
Ayush Shukla
ae696d005a
Changed report_hide=0 for reference_name ( #8902 )
2017-05-19 12:38:08 +05:30
Rushabh Mehta
6799e27390
[fix] chart of accounts root sorting, #8784 , #8897 ( #8904 )
2017-05-18 16:21:21 +05:30
Nabin Hait
61ac683847
Fixed chart of accounts for Indonesia ( #8900 )
2017-05-18 11:58:38 +05:30
Nabin Hait
8fac2ad183
Don't set batch nos automatically on saving, if already set and validate qty with batch ( #8887 )
2017-05-18 11:54:24 +05:30
Nabin Hait
08ea710c8f
Minor fix in creating chart of accounts based on existing ( #8890 )
2017-05-17 19:43:12 +05:30
Nabin Hait
4b544347a9
Hide 'Edit Posting Time' from printing ( #8888 )
2017-05-17 19:42:38 +05:30
tundebabzy
cf7df5d106
fixes #8883 ( #8885 )
2017-05-17 19:17:04 +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
Nabin Hait
1e2d7b3519
Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice ( #8882 )
2017-05-17 13:52:21 +05:30
rohitwaghchaure
3da400b532
[fix] Due Date cannot be before Posting Date during amendement of an invoice ( #8841 )
2017-05-16 12:43:18 +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
rohitwaghchaure
09483d3c0f
[fix] Numeric keypad not displaying after creation of new customer ( #8797 )
2017-05-16 08:51:24 +05:30
rohitwaghchaure
d678809939
[fix] Party balance field showing wrong currency symbol ( #8832 )
2017-05-16 08:06:45 +05:30
Faris Ansari
769b6bada8
[POS] Add Pay menu item in mobile view ( #8801 ) ( #8845 )
2017-05-16 07:31:10 +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
Nabin Hait
5ad6126832
On saving of Accounts Settings, only save enabled warehouses ( #8772 )
2017-05-11 13:34:04 +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
Faris Ansari
734d7795f8
Show party name in General Ledger print report ( #8760 )
2017-05-11 11:38:30 +05:30
Makarand Bauskar
464f108586
[minor] added currency in Totals for Trial Balance report ( #8757 )
...
* [minor] added currency in Totals for Trial Balance report
* [minor] used erpnext.get_default_currency to fetch the company currency
2017-05-10 19:40:36 +05:30
Saurabh
9df45bbc42
[fix] Reference Document is required to create Payment Request ( #8729 )
...
* [fix] Referene Document is required to create Payment Request
* Update payment_request.py
2017-05-08 17:24:23 +05:30
Ishan Loya
120ee275cc
Fix typo ( #8719 )
2017-05-06 12:48:22 +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
d2a966eef3
Update general_ledger.py
2017-05-05 10:41:16 +05:30
Nabin Hait
932423ecba
Balance Sheet always shows accumulated values from previous fiscal year ( #8668 )
2017-05-04 12:12:29 +05:30
rohitwaghchaure
a1923574c6
Merge pull request #8657 from rohitwaghchaure/pos_email_id_issue
...
[fix] Contact not creating if only email id has entered in the POS
2017-05-03 12:56:13 +05:30
Nabin Hait
ef027e9030
Correct args to the fmt_money function
2017-05-03 11:51:47 +05:30
Rohit Waghchaure
fd37516165
[fix] Contact not creating if only email id has entered in the POS
2017-05-02 18:27:09 +05:30
Rohit Waghchaure
61165127fc
[fix] Default pos profile's customer not working for the POS
2017-05-02 13:04:08 +05:30
Rohit Waghchaure
3df7eef6cc
[fix] Unable to create an asset due to rounding issue
2017-05-02 09:49:02 +05:30
Nabin Hait
2afb9b96cd
pricing rule fix
2017-04-28 15:20:49 +05:30
Nabin Hait
8c9fb76854
Remove pricing rules if 'Ignore Pricing Rule' manually triggered
2017-04-28 15:20:49 +05:30
Rohit Waghchaure
0e6ac8b9b4
Enabled option User Cannot Search for the gl entry doctype
2017-04-28 10:03:18 +05:30
Nabin Hait
d5d8db7a3f
Cleanup on financial statement PR
2017-04-25 16:26:33 +05:30
Nabin Hait
39bcb3de4b
Merge branch 'accumulated_header_std' of https://github.com/RicardoJohann/erpnext into RicardoJohann-accumulated_header_std
2017-04-25 16:13:54 +05:30
Ishan Loya
17737e4ab1
Change permissions, change account fieldname and add notes section
2017-04-25 16:08:22 +05:30
Ishan Loya
2fca72ae8e
Change owner
2017-04-25 16:08:22 +05:30
Ishan Loya
0dbe8547e7
Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique
2017-04-25 16:08:22 +05:30
Ishan Loya
e1ed5ba726
Remove commented out code
2017-04-25 16:08:22 +05:30
Ishan Loya
0fc57a7df2
Change doctype owner
2017-04-25 16:08:22 +05:30
Ishan Loya
c7a72684fd
Add bank guarantee doctype with documentation
2017-04-25 16:08:22 +05:30
Nabin Hait
9b20e07431
[fix] currency field precision
2017-04-25 14:09:29 +05:30
mbauskar
9cf6d630e9
[minor] fixes for expense claim status
2017-04-25 13:15:50 +05:30
Nabin Hait
e3c122d8c4
AR report: filter based on customer group and credit days based on field. Fixed #8214
2017-04-24 19:06:07 +05:30
Rohit Waghchaure
dd70fbfdae
[fix] Letter head not showing in the report
2017-04-24 18:57:51 +05:30
mbauskar
bb2670d57a
[fixes] minor fixes in bank reconciliation form and report
2017-04-24 10:23:50 +05:30
mbauskar
c3d642e5d1
[minor] allow bulk edit for doctype
2017-04-21 17:50:40 +05:30
Nabin Hait
68ae9f3f88
Merge branch 'develop' into allow_on_submit_fix
2017-04-19 21:10:23 +05:30
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
2017-04-19 21:05:37 +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
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
Nabin Hait
f382373cf4
Merge branch 'develop' into develop
2017-04-19 21:01:19 +05:30
Nabin Hait
8691e0777b
Update purchase_invoice_item.json
2017-04-19 20:58:09 +05:30
Nabin Hait
2de3bf7a0f
Fixed indexes on sales and purchase transactions
2017-04-19 20:58:09 +05:30
Rohit Waghchaure
f4f774d1df
[fix] offline_pos_name is not defined during print from the POS
2017-04-19 20:50:35 +05:30
Nabin Hait
2704162f5a
Fixes allowd on submit
2017-04-19 16:25:39 +05:30
Nabin Hait
117be7ddd5
Added a settings in Accounts Settings to disable booking depreciation entry automatically
2017-04-18 14:03:06 +05:30
Nabin Hait
8a01980757
Unlink Journal Entry reference from Asset
2017-04-18 13:11:10 +05:30
Rohit Waghchaure
d7de3c606b
[fix] Pricing rule for pos
2017-04-17 17:32:36 +05:30
Nabin Hait
e2431fd5e9
minor fix
2017-04-17 15:35:36 +05:30
Nabin Hait
83ca262e38
Merge pull request #8453 from StrellaGroup/develop
...
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-17 14:00:12 +05:30
mbauskar
22cedeb006
[minor] POS & RFQ format_number fixes
2017-04-17 12:24:24 +05:30
Javier Wong
54d9c9eaf4
Merge branch 'develop' into develop
2017-04-14 18:33:44 +08:00
Javier Wong
9b11d9b45d
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
2017-04-14 18:24:04 +08:00
mbauskar
1e05077b1f
[minor] sales register report fixes
2017-04-14 09:59:49 +05:30
Faris Ansari
185762aeeb
update label
2017-04-13 12:36:08 +05:30
Faris Ansari
19f90e984e
[POS] Show stock quantity of items
...
- frappe/erpnext#8247
2017-04-12 16:06:31 +05:30
Faris Ansari
b5608f9b14
[fix] Default Print Format for Sales Invoice ( #8419 )
...
- frappe/erpnext#8416
2017-04-12 15:31:01 +05:30
rohitwaghchaure
5adce495aa
Merge pull request #8417 from rohitwaghchaure/due_date_issue
...
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 14:43:21 +05:30
Rohit Waghchaure
2192c244c0
[fix] POS, Due Date cannot be before Posting Date
2017-04-12 13:19:05 +05:30
mbauskar
2f9703c20e
[minor] set company_currency as account_currency in general ledger if party type is employee
2017-04-11 18:56:41 +05:30
joezsweet
768a888bf2
[fix] validate supplier invoice
...
- modified to check for the selected supplier only
2017-04-11 18:52:46 +05:30
Rohit Waghchaure
87ad6d074a
[enhance] Stock qty added in purchase invoice
2017-04-11 18:29:52 +05:30
Kanchan Chauhan
95108ac80b
[Minor] Party validation for Employee
2017-04-11 18:29:27 +05:30
mbauskar
236f7aac7f
[minor] track changes for transaction documents
2017-04-10 14:48:54 +05:30
Nabin Hait
549a2827e5
Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8
...
[fix] Customer edit issue in offline POS
2017-04-05 14:51:44 +05:30
Rohit Waghchaure
2861955632
[fix] Customer edit issue in offline POS
2017-04-04 09:59:29 +05:30
Nabin Hait
731efe3a95
Minor fix in gross profit report
2017-04-03 12:11:36 +05:30
Nabin Hait
2c892c7e7f
Indentation fixed in gross profit report
2017-04-03 12:05:35 +05:30
Nabin Hait
b15d999147
Merge branch 'develop' into gross_profit_issue_v_8
2017-03-31 17:39:45 +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
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Rohit Waghchaure
34b1dba9aa
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
2017-03-31 12:44:10 +05:30
Ricardo Johann
033e2fa8b6
changed accumulated header
2017-03-31 02:18:54 -03:00
Nabin Hait
620bde7144
Updated modified date to reload sales uom
2017-03-30 19:50:45 +05:30
Nabin Hait
e503f68ec7
Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue
...
[fix] POS cart item's highlighted issue
2017-03-30 19:26:33 +05:30
Rohit Waghchaure
a86bb69adf
[fix] POS cart item's highlighted issue
2017-03-30 19:16:38 +05:30
