Nabin Hait
|
202bcc09d5
|
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
[Enhancement] POS features
|
2017-01-04 15:15:32 +05:30 |
|
Nabin Hait
|
1d88c65be4
|
Merge pull request #7374 from rohitwaghchaure/billed_report_enhancement
[Enhancement] Consolidated billed report, changed the report type from query to script
|
2017-01-02 17:40:51 +05:30 |
|
Nabin Hait
|
7fc18f359c
|
Currency symbol for budget amount based on company
|
2017-01-02 17:21:34 +05:30 |
|
Nabin Hait
|
92254d3930
|
Set serial nos in DN based on FIFO based on Stock Settings
|
2017-01-02 17:01:27 +05:30 |
|
Rohit Waghchaure
|
5a383e5cdd
|
[Enhancement] Consolidated billed report, changed type from query to script
|
2017-01-02 16:20:43 +05:30 |
|
Nabin Hait
|
06966e8e1d
|
minor fix
|
2017-01-02 15:10:01 +05:30 |
|
Nabin Hait
|
9646be1d5d
|
[fix] Make Journal Entry against SO
|
2016-12-30 11:14:41 +05:30 |
|
Rohit Waghchaure
|
bef185c404
|
restrict user to edit the rate in the POS
|
2016-12-28 15:16:49 +05:30 |
|
Rohit Waghchaure
|
aa9b8603b9
|
added paid amount in print format
|
2016-12-27 17:43:23 +05:30 |
|
Rohit Waghchaure
|
fe7a5b305f
|
create customer from POS
|
2016-12-27 17:31:32 +05:30 |
|
Rohit Waghchaure
|
8c9c9cfc5f
|
When a new company is made, cash account should be automatically set for Mode of Payment
|
2016-12-27 17:31:32 +05:30 |
|
Nabin Hait
|
c2690425e3
|
Merge pull request #7310 from bhupennewalkar1337/hotfix
Fix #7202 unchecking pos will reflect automatically
|
2016-12-26 16:07:19 +05:30 |
|
bhupen
|
bcf63a2a8f
|
unchecking pos will reflect automatically
|
2016-12-23 18:00:18 +05:30 |
|
Nabin Hait
|
58291c77e9
|
Fixed version conflict
|
2016-12-23 17:43:42 +05:30 |
|
Rohit Waghchaure
|
dd58d537d5
|
[Fix] POS issue for serialized items
|
2016-12-21 17:55:40 +05:30 |
|
Rohit Waghchaure
|
9df946e96c
|
[Fix] Warehouse is mandatory for packing materials on the sales invoice
|
2016-12-21 13:27:54 +05:30 |
|
Nabin Hait
|
6eda07e445
|
Fixed merge conflict
|
2016-12-15 16:35:58 +05:30 |
|
Nabin Hait
|
f02f1bb0c7
|
Added standard filters
|
2016-12-15 14:57:20 +05:30 |
|
Nabin Hait
|
6a1c0665bc
|
Merge pull request #7227 from nabinhait/country_coa
Chart of accounts for few countries, added test cases for each country
|
2016-12-15 11:31:07 +05:30 |
|
Rushabh Mehta
|
e9d9b8e6f0
|
[fix] demo and process payroll for demo (#7224)
* [fix] demo and process payroll for demo
* [fix] set payroll dates
|
2016-12-15 11:27:35 +05:30 |
|
Nabin Hait
|
e3edfe2b12
|
Removed quick entry for tax rule
|
2016-12-14 18:44:27 +05:30 |
|
Nabin Hait
|
a756d64fca
|
Chart of accounts for some countries, added test cases for each country
|
2016-12-14 18:40:29 +05:30 |
|
Nabin Hait
|
a9ecc0b700
|
Merge branch 'master' into develop
|
2016-12-14 14:33:06 +05:30 |
|
Rohit Waghchaure
|
39712b5e1d
|
[Fix] Pricing rule issue
|
2016-12-14 14:12:20 +05:30 |
|
Nabin Hait
|
a933713f9d
|
Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev
erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation
|
2016-12-14 12:54:04 +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 |
|
OluyomiKay
|
8f8fd39855
|
erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation
|
2016-12-14 13:25:58 +08:00 |
|
Nabin Hait
|
201af80706
|
Fixed merge conflict
|
2016-12-13 14:30:32 +05:30 |
|
Rohit Waghchaure
|
2976e56d23
|
[Fix] Ignore pricing rule not removed the discount percentage
|
2016-12-13 10:28:27 +05:30 |
|
Nabin Hait
|
f67799197d
|
Merge pull request #7189 from nabinhait/fix_10111
Rename and merging of Item and Warehouse
|
2016-12-12 17:27:38 +05:30 |
|
Rohit Waghchaure
|
9f2cc382a8
|
[POS] Provision to delete the offline records
|
2016-12-12 17:15:47 +05:30 |
|
Rohit Waghchaure
|
f4074c2029
|
[Fix] Budget variance report
|
2016-12-12 16:48:14 +05:30 |
|
Nabin Hait
|
142aab79bf
|
Fieldtype of payment url should be Small Text
|
2016-12-12 15:37:52 +05:30 |
|
Rohit Waghchaure
|
5664f8553e
|
[Fix] Item group missing in the POS profile
|
2016-12-12 12:28:07 +05:30 |
|
Saurabh
|
940084ed59
|
[minor][fix] show tax rate if account type is tax
|
2016-12-09 17:38:36 +05:30 |
|
Rushabh Mehta
|
81af229466
|
[minor] google analytics id in docs and minor fixes to web forms
|
2016-12-09 17:29:36 +05:30 |
|
Nabin Hait
|
58667ab123
|
Fixed merge conflict
|
2016-12-09 15:49:24 +05:30 |
|
Nabin Hait
|
00ae31bd1c
|
Merge pull request #7172 from nabinhait/hotfix
Issue fixed in Quality Inspection, P&L period and purchase register
|
2016-12-09 15:44:05 +05:30 |
|
Nabin Hait
|
6bfdd63ec8
|
Merge pull request #7171 from rohitwaghchaure/payment_entry_issue
[Fix] Payment entry showing wrong invoice amount
|
2016-12-09 15:11:38 +05:30 |
|
Nabin Hait
|
b00df641e0
|
Fixed period end date if year starts in the middle of the month
|
2016-12-09 15:09:11 +05:30 |
|
Nabin Hait
|
43df804176
|
Fixed renamed fieldname
|
2016-12-09 15:09:11 +05:30 |
|
Rohit Waghchaure
|
e505067887
|
[Fix] Payment entry showing wrong invoice amount
|
2016-12-09 12:55:29 +05:30 |
|
Nabin Hait
|
ad4f1c7fd1
|
date is optional in get_exchange_rate
|
2016-12-09 12:14:47 +05:30 |
|
Nabin Hait
|
352d95344e
|
Set exchange rate on change of date for Journal/Payment Entry
|
2016-12-08 16:06:47 +05:30 |
|
Nabin Hait
|
1cc55fbbcb
|
Fixed merge conflict
|
2016-12-08 14:09:23 +05:30 |
|
Nabin Hait
|
72c5aec68b
|
Merge pull request #7094 from manassolanki/budget
[Enhancement] Budget Against Project #7036
|
2016-12-08 13:52:33 +05:30 |
|
Nabin Hait
|
1b9caf90dd
|
Merge branch 'master' into develop
|
2016-12-08 12:33:54 +05:30 |
|
Manas Solanki
|
482fa672c2
|
[Fix] Patch for budget_against
|
2016-12-08 12:16:29 +05:30 |
|
Rohit Waghchaure
|
86ed030b5c
|
minor issue
|
2016-12-07 19:17:01 +05:30 |
|
Manas Solanki
|
2e0fbdeebe
|
[Fix] Test Case
- Previous test case fixed
- Additional test case for project against budget
|
2016-12-07 18:17:26 +05:30 |
|