Saurabh
|
c32f8eb0cb
|
Merge branch 'hotfix'
|
2019-04-05 16:59:22 +05:30 |
|
Saurabh
|
63fabc3723
|
bumped to version 11.1.19
|
2019-04-05 17:29:22 +06:00 |
|
Nabin Hait
|
398e4b9472
|
fix: Ignore item tax patch if old schema does not exists
|
2019-04-05 16:41:17 +05:30 |
|
Nabin Hait
|
e6ee43b102
|
Merge pull request #17145 from Mangesh-Khairnar/salary-register-doj
feat: add date of joining column in salary register
|
2019-04-05 16:02:48 +05:30 |
|
Nabin Hait
|
374b85b38e
|
Merge pull request #17140 from hrwX/pe_supp_inv_v12
fix(Payment Entry): Return Bill No on for Payment Entry
|
2019-04-05 15:59:58 +05:30 |
|
Nabin Hait
|
d70476fbc8
|
Merge pull request #17139 from hrwX/pe_supp_inv_v11
fix(Payment Entry): Return Bill No for Payment Entry
|
2019-04-05 15:59:43 +05:30 |
|
Nabin Hait
|
8cf76e74e0
|
Merge pull request #17133 from hrwX/validate_stock_transaction_v11
fix(Item): check transactions for batch, serial check
|
2019-04-05 15:41:35 +05:30 |
|
Nabin Hait
|
843e440191
|
Merge branch 'hotfix' into validate_stock_transaction_v11
|
2019-04-05 15:41:26 +05:30 |
|
Nabin Hait
|
9302a19d74
|
Merge pull request #17135 from hrwX/validate_stock_transaction_v12
fix(Item): check transactions for batch, serial check
|
2019-04-05 15:40:19 +05:30 |
|
Nabin Hait
|
1580e24946
|
Merge pull request #17137 from netchampfaris/item-group-clean-description
fix(Item Group): Don't clean description html
|
2019-04-05 15:39:44 +05:30 |
|
Nabin Hait
|
603dce428b
|
Merge pull request #17144 from nabinhait/variant-fix
fix: Default variant Based on
|
2019-04-05 15:38:15 +05:30 |
|
Anurag Mishra
|
0dc62e8747
|
fix: Removed raw query and used frappe.get_all
|
2019-04-05 14:36:43 +05:30 |
|
Anurag Mishra
|
f71c147ea8
|
Added mandatory feilds to the report
|
2019-04-05 14:36:43 +05:30 |
|
Anurag Mishra
|
5c17e7760b
|
fix: readability
|
2019-04-05 14:36:43 +05:30 |
|
Anurag Mishra
|
b57c024ff7
|
feat: Project Billing Summary for timesheet
|
2019-04-05 14:36:43 +05:30 |
|
Anurag Mishra
|
61aab377b6
|
Minor Fixes
|
2019-04-05 14:36:42 +05:30 |
|
Anurag Mishra
|
3d27aabdeb
|
Commonify code
|
2019-04-05 14:36:42 +05:30 |
|
Anurag Mishra
|
94514ffee9
|
feat: timesheet Employee Summary Report
|
2019-04-05 14:36:42 +05:30 |
|
Mangesh-Khairnar
|
3c251663bb
|
style: add type comparison for boolean expression
|
2019-04-05 14:10:05 +05:30 |
|
rohitwaghchaure
|
e334413b34
|
Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if
fix: incorrect auto POS profile selected in the sales invoice
|
2019-04-05 13:04:05 +05:30 |
|
Mangesh-Khairnar
|
e7d53540de
|
feat: add doj column in salary register
|
2019-04-05 12:56:11 +05:30 |
|
Mangesh-Khairnar
|
3d667b4c94
|
Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold
|
2019-04-05 12:11:26 +05:30 |
|
Nabin Hait
|
a3357e4e86
|
fix: Default variant Based on
|
2019-04-05 12:10:36 +05:30 |
|
John Clarke
|
b733984ca1
|
fix: Remove duplicate Timesheet item (#17066)
|
2019-04-05 11:02:25 +05:30 |
|
rohitwaghchaure
|
fc471ed63b
|
Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop
fix: incorrect POS profile selected
|
2019-04-05 09:59:16 +05:30 |
|
Rohit Waghchaure
|
c2ed03f77a
|
always set the company from the POS Profile
|
2019-04-05 09:58:04 +05:30 |
|
Rohit Waghchaure
|
e8e3fb175d
|
fix: incorrect POS profile selected
|
2019-04-05 09:57:52 +05:30 |
|
Rohit Waghchaure
|
4324f43a06
|
always set the company from the POS Profile
|
2019-04-05 09:54:55 +05:30 |
|
rohitwaghchaure
|
cbdd3304a4
|
Merge pull request #17138 from rohitwaghchaure/search_items_not_works_in_the_pos
fix: POS search items not works properly if item group filter has applied
|
2019-04-05 00:45:53 +05:30 |
|
Rohit Waghchaure
|
f7a83cb4f5
|
fix: incorrect POS profile selected
|
2019-04-05 00:42:48 +05:30 |
|
cjpit
|
0c87895afc
|
fix(node_modules): remove hardcoded symlink (#16975)
* add node_modules directory to gitignore
* remove node_modules symlink
|
2019-04-05 00:12:26 +05:30 |
|
Himanshu Warekar
|
b30f584410
|
fix: return bill_no
|
2019-04-04 19:55:13 +05:30 |
|
Himanshu Warekar
|
6443d7dd10
|
refactor: declare bill_on at function start
|
2019-04-04 19:54:23 +05:30 |
|
Himanshu Warekar
|
ad32324c4c
|
fix: get bill_no
|
2019-04-04 19:50:23 +05:30 |
|
Rohit Waghchaure
|
0a4aee0206
|
fix: POS search items not works properly if item group filter has applied
|
2019-04-04 16:02:15 +05:30 |
|
Faris Ansari
|
7a0a05d8f1
|
fix(Item Group): Don't clean description html
|
2019-04-04 15:53:16 +05:30 |
|
rohitwaghchaure
|
0a57ef4bea
|
Merge pull request #17134 from rohitwaghchaure/not_able_to_change_pos_profile
fix: not able to change pos profile
|
2019-04-04 15:42:28 +05:30 |
|
Himanshu Warekar
|
cdd79e3c40
|
fix: check transactions for batch, serial check
|
2019-04-04 15:26:35 +05:30 |
|
Rohit Waghchaure
|
55d3bcac37
|
fix: not able to change pos profile
|
2019-04-04 15:26:00 +05:30 |
|
Himanshu Warekar
|
7f253b679a
|
pull from hotfix
|
2019-04-04 15:19:44 +05:30 |
|
Himanshu Warekar
|
28db545947
|
fix: check transactions for batch, serial check
|
2019-04-04 15:02:25 +05:30 |
|
Nabin Hait
|
82bd388993
|
Merge pull request #17122 from frappe/asbasawaraj-remove-location-from-abbreviation-doctypes
fix: Removed Location from Abbreviation Update DocTypes
|
2019-04-04 11:50:33 +05:30 |
|
Nabin Hait
|
9087efa5be
|
Merge pull request #17131 from Anurag810/desk-fixes
fix: desk for selling module, sales invoice now avaialble at module page (WN-SUP41771).
|
2019-04-04 11:49:56 +05:30 |
|
Nabin Hait
|
b861c4bc46
|
Merge pull request #16895 from Alchez/hotfix-shipping-charge-override
fix(transaction): Fix shipping rule charge override by tax template
|
2019-04-04 11:48:48 +05:30 |
|
Nabin Hait
|
e0a9835f30
|
Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix
fix(Party Ledger Summary): Show all adjustment entries as columns
|
2019-04-04 11:45:36 +05:30 |
|
Nabin Hait
|
0747273ea4
|
Merge pull request #17028 from sagarvora/field_order
fix(accounts): dependent field should be displayed after source link field
|
2019-04-04 11:45:01 +05:30 |
|
Nabin Hait
|
94c822f5f0
|
Merge pull request #17022 from hrwX/cost_center_fix
fix(Purchase Invoice): Cost Centre as per company
|
2019-04-04 11:43:44 +05:30 |
|
Nabin Hait
|
9eeb3715f0
|
Merge pull request #16992 from hrwX/cost_center
fix(Purchase Invoice): Cost Centre as per company
|
2019-04-04 11:43:35 +05:30 |
|
Nabin Hait
|
2df623c693
|
Merge pull request #17072 from kennethsequeira/auto-re-val
fix: spelling in validation message for Auto-reorder
|
2019-04-04 11:40:08 +05:30 |
|
Nabin Hait
|
1e5664ba5f
|
Update item.py
|
2019-04-04 11:39:55 +05:30 |
|