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
Rohit Waghchaure
60a05324ce
POS changes and fixes
2016-09-12 13:11:10 +05:30
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
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
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
