Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,601 Commits 3 Branches 0 Tags 1 GiB
2cccad0274
Commit Graph

21601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saurabh
cbbee47625 [Fix] Resolved the type issue of 'is_saved' flag variable 2018-01-23 17:23:27 +05:30
Saurabh
a2076a1ff0 Multiple changes: 
[Mod] Used async-await for asynchronous save in draft mode
[Fix] Fixed bug that din't allow to submit a new POS Invoice
 2018-01-23 17:23:26 +05:30
Saurabh
c5a6cf3a0e [Mod] Allows print only when the check value exists and the cart isn't empty 2018-01-23 17:23:26 +05:30
Saurabh
3a609108ae Codacy changes 2018-01-23 17:23:26 +05:30
Saurabh
32695a938f [Mod] Refactored the code for fetching allow_print_before_pay check value 2018-01-23 17:23:26 +05:30
deepak-mnt
d7da89bf5a [Fix] Resolved issues suggested by Codacy 2018-01-23 17:21:44 +05:30
deepak-mnt
8f3d394485 Minor changes:Removed extra spaces in py code 2018-01-23 17:21:44 +05:30
deepak-mnt
cc813d2286 [Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode 2018-01-23 17:21:44 +05:30
deepak-mnt
1ccb0cfa2f [Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print 
[New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS
 2018-01-23 17:21:44 +05:30
deepak-mnt
29abe291c9 Allow draft mode print in online POS 2018-01-23 17:21:44 +05:30
Saurabh
57df096725
Merge pull request #12600 from vishdha/allow_rename 
[new] Allow Rename and Member link with user
 2018-01-23 16:49:48 +05:30
Saurabh
db2d02a3e3
Merge pull request #12618 from shreyashah115/warehouse-list 
Disabled field in list view - Warehouse DocType
 2018-01-23 16:48:59 +05:30
Shreya
dfae11bcee disabled warehouse in list view 2018-01-23 16:46:24 +05:30
Rushabh Mehta
b5a3df920c [fix] primary button color for make 2018-01-23 16:08:52 +05:30
rohitwaghchaure
d78e6e04ea Run country fixtures if country changed in the company (#12494) 2018-01-23 15:42:46 +05:30
Saurabh
3959aeb848 [fix] parse value before setting it to dissable_rounded_total on Purchase Invoice 2018-01-23 15:40:43 +05:30
Charles-Henri Decultot
90657fb566 FEC report for France (#12446) 
* FEC report for France

* Codacy correction
 2018-01-23 15:40:14 +05:30
Jamsheer
d63b7e16af Patient Appointment - Check appointment day is holiday or physician on leave (#12556) 2018-01-23 15:38:34 +05:30
Shreya Shah
3191951bff Updated docs for Payroll Entry (#12552) 
* updated docs for payroll entry

* fixed a link in employee-advance doc
 2018-01-23 15:37:23 +05:30
rohitwaghchaure
881d32c4b8
Merge pull request #12540 from shreyashah115/posting-date 
[Payroll Entry] Set posting date only if null
 2018-01-23 15:10:26 +05:30
rohitwaghchaure
f8a98f5eeb
Merge pull request #12609 from britlog/payment-request-translation 
[Stripe] Translate payment request subject
 2018-01-23 14:47:55 +05:30
rohitwaghchaure
b607c6f8b2
Merge pull request #12610 from MaxMorais/patch-7 
Serial No, wont relates to the warehouse
 2018-01-23 14:46:46 +05:30
Frappe PR Bot
48d4a0a438 [Translation] Updated Translations (#12613) 2018-01-23 14:35:52 +05:30
rohitwaghchaure
51293390e4
Merge pull request #12611 from shreyashah115/fetch-conversion-factor 
[Fix] Fetch uom conversion factor in material request
 2018-01-23 12:41:01 +05:30
rohitwaghchaure
63f4da4402
Merge pull request #12612 from shreyashah115/fix-validation 
Fix validation message for overbilling
 2018-01-23 12:35:37 +05:30
pawan
9b7093e4d6 validation code improvement 2018-01-23 11:39:53 +05:30
Shreya
a137fe82a1 fix error message 2018-01-23 11:00:58 +05:30
Shreya
e2b31085a7 fetch uom conversion factor in material request 2018-01-23 10:54:23 +05:30
Maxwell Morais
7cffd618ab
Serial No, wont relates to the warehouse 
The serial no, picker wont follow the target serial no
 2018-01-22 22:33:28 -02:00
britlog
ddd2bc9aac Translate payment request subject 2018-01-22 23:23:31 +01:00
pawan
6a8eba891e Move target warehouse validation to submit 2018-01-23 00:57:44 +05:30
pawan
afab0a64e5 code alignment 2018-01-22 17:34:27 +05:30
pawan
4ab6ef89a1 code alignment 2018-01-22 17:31:40 +05:30
pawan
67867529c0 [fix] #8540 2018-01-22 17:08:39 +05:30
Vishal
a54815fd9d [new] Allow Rename and Member link with user 2018-01-22 16:02:45 +05:30
Saurabh
ef31637549 Merge branch 'master' into develop 2018-01-22 15:29:15 +05:30
Saurabh
4f927ac3e8 Merge branch 'hotfix' 2018-01-22 15:29:14 +05:30
Saurabh
b9f678b350 bumped to version 10.0.13 2018-01-22 15:59:14 +06:00
Saurabh
fb4caff0b2
Merge pull request #12573 from rohitwaghchaure/reorder_issue 
[Fix] Wrong projected qty for warehouse group in the process of reorder item, which making extra material requests
 2018-01-22 16:49:54 +07:00
Saurabh
e72915847c
Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column 
Added currency in balance column in general ledger print
 2018-01-22 16:35:37 +07:00
rohitwaghchaure
1d93bd50eb
Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue 
[Fix] Income account can not be group
 2018-01-22 15:04:46 +05:30
rohitwaghchaure
8e998875a5
Merge pull request #12590 from shreyashah115/total-on-items-remove 
[Fix] Calculate taxes when shipping rule not present at removal of item
 2018-01-22 15:03:11 +05:30
rohitwaghchaure
c87a3370cd
Merge pull request #12595 from rohitwaghchaure/image_path_in_item_search 
[Fix] Image path showing in the item link
 2018-01-22 15:01:58 +05:30
Shreya
5164997db7 delete column status 2018-01-22 14:13:03 +05:30
Rohit Waghchaure
c4c2bf0bfb [Fix] Image patch showing in the item link 2018-01-22 13:47:28 +05:30
Shreya
39adc8f85f calculate total when items are removed 2018-01-22 13:08:05 +05:30
Rohit Waghchaure
8676590cfe [Fix] Income account can not be group 2018-01-22 12:35:36 +05:30
Shreya
dd66bc03c7 fixes 2018-01-22 12:28:38 +05:30
Shreya
fc0e8e5c6a modified patches.txt 2018-01-22 12:26:41 +05:30
Shreya
4298bcfa40 modified leave application tests 2018-01-22 12:26:41 +05:30