rohitwaghchaure
|
8df0556af5
|
Merge pull request #12587 from shreyashah115/leave-workflow
Refactor Leave Application
|
2018-01-24 15:04:17 +05:30 |
|
Shreya
|
a8a952deff
|
check if workflow_state_name already exists
|
2018-01-24 15:00:54 +05:30 |
|
Rushabh Mehta
|
29bc14d242
|
[fix] ficher_des_ecritures patch
|
2018-01-24 14:39:04 +05:30 |
|
Shreya
|
a309a871b5
|
Codacy fix
|
2018-01-24 13:56:16 +05:30 |
|
Shreya
|
a400e7b568
|
Fixed as per the review
|
2018-01-24 13:30:20 +05:30 |
|
Saurabh
|
fb2f97391f
|
resolved merge conflicts
|
2018-01-24 11:24:10 +05:30 |
|
Saurabh
|
6c3289dbcd
|
Merge branch 'hotfix'
|
2018-01-24 11:22:54 +05:30 |
|
Saurabh
|
381d452b78
|
bumped to version 10.0.14
|
2018-01-24 11:52:53 +06:00 |
|
Saurabh
|
769874d0e9
|
Merge pull request #12628 from saurabh6790/enable_rename_option
[fix] enable rename for payment terms and payment term template
|
2018-01-24 11:15:53 +05:30 |
|
Saurabh
|
6cc10104f0
|
[fix] enable rename for payment terms and payment term template
|
2018-01-24 11:15:02 +05:30 |
|
Saurabh
|
5b67f4d953
|
Merge pull request #12626 from saurabh6790/item_price_stock_report_fix
[fix] If buying or selling price list not found, return empty dict
|
2018-01-24 10:55:51 +05:30 |
|
rohitwaghchaure
|
56a4f9205a
|
Merge pull request #12620 from mntechnique/draft-mode-print
Print Functionality in Online POS using allow print before pay check
|
2018-01-24 10:54:07 +05:30 |
|
Saurabh
|
9c6bf08e77
|
Merge pull request #12547 from joshreeder/patch-1
Update dropbox-backup.md
|
2018-01-24 07:57:15 +05:30 |
|
Saurabh
|
4b9a55b0ef
|
[fix] If buying or selling price list not found, return empty dict
|
2018-01-24 07:48:56 +05:30 |
|
Saurabh
|
b665baec72
|
Used cint instead of int
|
2018-01-23 18:28:05 +05:30 |
|
Saurabh
|
c8399fd093
|
Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno
Disabled property set only once for has serial no and has batch no field in item doctype
|
2018-01-23 18:08:56 +05:30 |
|
Rohit Waghchaure
|
266e66cd1b
|
Disabled property set only once for has serial no and has batch no field in item doctype
|
2018-01-23 18:06:12 +05:30 |
|
Saurabh
|
a5c9fc3705
|
Removed commented code
|
2018-01-23 17:36:41 +05:30 |
|
rohitwaghchaure
|
f3a452850e
|
Merge pull request #12617 from saurabh6790/ux_fix
parse value before setting it to dissable_rounded_total on Purchase Invoice
|
2018-01-23 17:35:16 +05:30 |
|
Saurabh
|
6c5f5b20cf
|
Merge branch 'develop' of https://github.com/frappe/erpnext into draft-mode-print
|
2018-01-23 17:33:21 +05:30 |
|
Charles-Henri Decultot
|
e31e1239ba
|
FEC report for France (#12446)
* FEC report for France
* Codacy correction
|
2018-01-23 17:23:27 +05:30 |
|
Jamsheer
|
58af1db0d7
|
Patient Appointment - Check appointment day is holiday or physician on leave (#12556)
|
2018-01-23 17:23:27 +05:30 |
|
Shreya Shah
|
673b59b114
|
Updated docs for Payroll Entry (#12552)
* updated docs for payroll entry
* fixed a link in employee-advance doc
|
2018-01-23 17:23:27 +05:30 |
|
Shreya
|
543feda2fb
|
set posting date only if null
|
2018-01-23 17:23:27 +05:30 |
|
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 |
|
Shreya
|
a137fe82a1
|
fix error message
|
2018-01-23 11:00:58 +05:30 |
|