Nabin Hait
|
533e564867
|
bumped to version 7.0.38
|
2016-09-02 16:49:21 +06:00 |
|
Nabin Hait
|
88d7e419ad
|
Merge pull request #6263 from nabinhait/timesheet_fix_101
Migrate employee field to timesheet only if it exists in time log
|
2016-09-02 16:18:12 +05:30 |
|
Nabin Hait
|
54254cca58
|
Update set_party_name_in_payment_entry.py
|
2016-09-02 16:17:42 +05:30 |
|
Nabin Hait
|
142f14dd5c
|
Migrate employee field to timesheet only if it exists in time log
|
2016-09-02 14:47:14 +05:30 |
|
Nabin Hait
|
15b26d8b1a
|
Fixed merge conflicts
|
2016-09-02 14:29:57 +05:30 |
|
Nabin Hait
|
0f0c131ba4
|
Merge branch 'hotfix'
|
2016-09-02 14:26:33 +05:30 |
|
Nabin Hait
|
e1e187bee1
|
bumped to version 7.0.37
|
2016-09-02 14:56:33 +06:00 |
|
Nabin Hait
|
c946c730da
|
Merge pull request #6258 from nabinhait/party_name_in_pe
Party name in Payment Entry and cheque print format
|
2016-09-02 14:20:22 +05:30 |
|
Nabin Hait
|
5a4ca64c4a
|
Party name in Payment Entry and cheque print format
|
2016-09-02 14:20:01 +05:30 |
|
Nabin Hait
|
47fd4c6521
|
Merge pull request #6261 from nabinhait/order_trends_fix
Ignore closed sales/purchase order in trends report
|
2016-09-02 14:17:30 +05:30 |
|
Nabin Hait
|
e58031ab49
|
Merge pull request #6249 from rohitwaghchaure/rfq_webform_issue
[RFQ] Web form alignment issue
|
2016-09-02 14:17:22 +05:30 |
|
Nabin Hait
|
f8e374643c
|
Merge pull request #6257 from nabinhait/letter_head_in_report
Default letter head in report printing based on selected company
|
2016-09-02 14:17:12 +05:30 |
|
Nabin Hait
|
0ef9da65dc
|
Merge pull request #6260 from rohitwaghchaure/timesheet_status_and_date_issue
[Fix] Updated timesheet status, start date, end date
|
2016-09-02 14:16:53 +05:30 |
|
Nabin Hait
|
98d58b5ed1
|
Merge pull request #6262 from saurabh6790/hotfix
[fix] set is_group filter in get query for warehouse
|
2016-09-02 14:14:47 +05:30 |
|
Saurabh
|
ff910f4c72
|
[fixes] set filter for warehouse
|
2016-09-02 13:39:05 +05:30 |
|
Nabin Hait
|
5c69fed218
|
Ignore closed sales/purchase order in trends report
|
2016-09-02 12:53:18 +05:30 |
|
Rohit Waghchaure
|
d07557eaf6
|
[Fix] Updated timesheet status
|
2016-09-02 12:24:54 +05:30 |
|
Nabin Hait
|
13b37c6346
|
Default letter head in report printing based on selected company
|
2016-09-02 11:25:42 +05:30 |
|
Rohit Waghchaure
|
b34ba6bd6e
|
[RFQ] Web form alignment issue
|
2016-09-01 19:10:58 +05:30 |
|
Rushabh Mehta
|
b2f0920346
|
[minor] new global for query report filters
|
2016-09-01 17:53:42 +05:30 |
|
Nabin Hait
|
5a101ef4c6
|
Fixed merge conflict
|
2016-09-01 12:43:24 +05:30 |
|
Nabin Hait
|
94dbc14f8a
|
Merge branch 'hotfix'
|
2016-09-01 12:42:29 +05:30 |
|
Nabin Hait
|
600ab0f7a0
|
bumped to version 7.0.36
|
2016-09-01 13:12:29 +06:00 |
|
Nabin Hait
|
9afee28c36
|
Merge pull request #6243 from rohitwaghchaure/timesheet_issue
[Patch] Check table exist
|
2016-09-01 12:38:30 +05:30 |
|
Rohit Waghchaure
|
86f143863f
|
[Patch] Check table exist
|
2016-09-01 12:37:20 +05:30 |
|
Nabin Hait
|
2490ea0b91
|
Fixed merge conflict
|
2016-09-01 12:29:31 +05:30 |
|
Nabin Hait
|
c7be851bf8
|
Merge branch 'hotfix'
|
2016-09-01 12:26:11 +05:30 |
|
Nabin Hait
|
b6f33c7c4f
|
bumped to version 7.0.35
|
2016-09-01 12:56:11 +06:00 |
|
Nabin Hait
|
bb2bceef62
|
Merge pull request #6229 from rohitwaghchaure/pos_payment_issue
[POS] Fixed POS Sales Invoice when Payment Table is Empty
|
2016-09-01 12:25:31 +05:30 |
|
Nabin Hait
|
3e805708dc
|
Merge pull request #6237 from rohitwaghchaure/timesheet_employee_missing_issue
[Fix] Timesheet, employee is missing in patch
|
2016-09-01 12:15:06 +05:30 |
|
Rohit Waghchaure
|
7f165f19d2
|
[Fix] Timesheet employee is missing in patch
|
2016-09-01 12:07:21 +05:30 |
|
Rohit Waghchaure
|
774ce63b75
|
remove mode of payment, migrate mode of payment from v6 to v7
|
2016-08-31 21:21:41 +05:30 |
|
Rohit Waghchaure
|
879cb6ebee
|
[POS] Fixed POS Sales Invoice when Payment Table is Empty
|
2016-08-31 14:41:48 +05:30 |
|
Nabin Hait
|
48914b47b7
|
Merge branch 'strixaluco-patch-2' into develop
|
2016-08-31 12:36:18 +05:30 |
|
Nabin Hait
|
c0c2f75159
|
fixed conflict
|
2016-08-31 12:36:03 +05:30 |
|
Nabin Hait
|
16e15283b5
|
Imported unicode literals
|
2016-08-31 12:33:22 +05:30 |
|
Nabin Hait
|
566759acae
|
Merge pull request #6211 from rohitwaghchaure/v7.1_fixes
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-31 12:12:48 +05:30 |
|
Nabin Hait
|
88e3487f03
|
Merge pull request #6206 from neilLasrado/docs
Updated Docs for Schools Module
|
2016-08-31 12:12:17 +05:30 |
|
Nabin Hait
|
fa3146b444
|
Merge pull request #6218 from RobertSchouten/patch-20
fix for duplicate to bill status comment on submit
|
2016-08-31 11:09:47 +05:30 |
|
Nabin Hait
|
ef16d657ff
|
Merge pull request #6226 from rohitwaghchaure/pos_fixes_and_cleanups
[POS] Currency format issue, added zero value condition
|
2016-08-31 11:02:16 +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 |
|
Nabin Hait
|
4f71190a85
|
Merge pull request #6215 from rohitwaghchaure/pos_precision_issue
[Fix] Precision issue for field conversion rate in POS
|
2016-08-30 09:52:55 +05:30 |
|
Nabin Hait
|
385e8edd3c
|
Merge pull request #6216 from rohitwaghchaure/update_component_patch_fix
[Patch] Fixed error unknown column 'type' in 'field list'
|
2016-08-30 09:51:23 +05:30 |
|
RobertSchouten
|
ba4456b42b
|
dont run duplicate set status on submit
|
2016-08-30 08:21:20 +08:00 |
|
Rohit Waghchaure
|
da7fb70009
|
[Patch] Fixed error unknown column 'type' in 'field list'
|
2016-08-30 01:41:35 +05:30 |
|
Rohit Waghchaure
|
a57bf5ee2e
|
[fix] Precision issue for field conversion rate in POS
|
2016-08-30 01:05:01 +05:30 |
|
Nabin Hait
|
d260602cae
|
Merge pull request #6202 from KanchanChauhan/component-type-added
'Type' field added to Salary Component
|
2016-08-29 16:19:05 +05:30 |
|
Kanchan Chauhan
|
145f87c068
|
'Type' field added to Salary Component
|
2016-08-29 15:26:57 +05:30 |
|
Rohit Waghchaure
|
a2bf16bfaa
|
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-29 13:37:13 +05:30 |
|