Nabin Hait
|
ee25cf7ead
|
Merge branch 'rohitwaghchaure-sales_order_status_issue' into hotfix
|
2016-10-07 14:16:36 +05:30 |
|
Nabin Hait
|
2f75b7b42e
|
Fixed merge conflict
|
2016-10-07 14:16:17 +05:30 |
|
Nabin Hait
|
1915214518
|
Merge pull request #6576 from rohitwaghchaure/item_rename_issue
[Fix] Issue in merging duplicate item
|
2016-10-07 14:11:49 +05:30 |
|
Nabin Hait
|
eb08d632b3
|
Merge pull request #6565 from saurabh6790/warehouse_group_account_rename_fix
[fix] warehouse account rename fix #6526
|
2016-10-07 14:11:14 +05:30 |
|
Rohit Waghchaure
|
770d04e633
|
[Fix] sales order status showing completed, while it's status was to bill
|
2016-10-07 13:55:48 +05:30 |
|
Rohit Waghchaure
|
022d87969d
|
[Fix] Issue in merging duplicate item
|
2016-10-07 13:40:45 +05:30 |
|
shreyas
|
a1d7646e70
|
[Fix] Allow user to save Notification Control without selecting transaction
|
2016-10-07 12:58:58 +05:30 |
|
Nabin Hait
|
bd2a1c3553
|
Merge pull request #6572 from RobertSchouten/patch-33
[fix] update timestamps and relink communication for timesheet
|
2016-10-07 12:54:54 +05:30 |
|
Nabin Hait
|
16f3f378f6
|
Update patches.txt
|
2016-10-07 12:54:27 +05:30 |
|
Nabin Hait
|
1885207eca
|
Update and rename update_timesheet_modified_created to update_timesheet_communications
|
2016-10-07 12:54:04 +05:30 |
|
RobertSchouten
|
e0a636c081
|
[fix] update timestamps and relink communication for timesheet
|
2016-10-07 11:03:04 +08:00 |
|
RobertSchouten
|
ef4e41380b
|
[fix] update timestamps and relink communication for timesheet
|
2016-10-07 11:01:12 +08:00 |
|
Saurabh
|
a2a25abfa5
|
[fix] warehouse account rename fix #6526
|
2016-10-06 18:20:53 +05:30 |
|
Nabin Hait
|
77ede941b0
|
Merge pull request #6550 from rohitwaghchaure/make_payment_using_journal_entry
[Enhancement] Option to make payment via Journal Entry
|
2016-10-06 17:07:11 +05:30 |
|
Rohit Waghchaure
|
7d5298997b
|
Documentation for payments
|
2016-10-06 16:49:39 +05:30 |
|
Nabin Hait
|
60a099cd85
|
Merge pull request #6557 from vrms/patch-3
Update product-bundle.md
|
2016-10-06 15:34:42 +05:30 |
|
Nabin Hait
|
1397159bc1
|
Merge pull request #6561 from rohitwaghchaure/remove_sales_invoice_from_scheduler_log
removed sales invoice from scheduler log
|
2016-10-06 15:32:55 +05:30 |
|
Nabin Hait
|
ec08a50af1
|
Merge pull request #6564 from rohitwaghchaure/expense_claim_issue
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
|
2016-10-06 15:32:37 +05:30 |
|
Nabin Hait
|
4eb196905b
|
Merge pull request #6562 from saurabh6790/hotfix
[fix] sales order translation for language code: fr
|
2016-10-06 15:28:41 +05:30 |
|
Rohit Waghchaure
|
370e711f48
|
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
|
2016-10-06 15:19:53 +05:30 |
|
Saurabh
|
3ae5672e27
|
[fix] sales order translation for language code: fr
|
2016-10-06 12:57:21 +05:30 |
|
Rohit Waghchaure
|
297fbcd388
|
removed sales invoice from scheduler log
|
2016-10-06 12:40:09 +05:30 |
|
Rohit Waghchaure
|
b7a5502b97
|
[Enhancement] Option to make payment via Journal Entry
|
2016-10-06 12:04:52 +05:30 |
|
vrms
|
bbe7a1062e
|
Update product-bundle.md
tried to work out the mechanics of Parent and Child items a little clearer
|
2016-10-06 07:40:21 +08:00 |
|
Rushabh Mehta
|
4dacaa103c
|
[minor] do not submit after accpeting payment
|
2016-10-05 19:20:37 +05:30 |
|
Rushabh Mehta
|
a47652624a
|
[minor] student applicant fixes
|
2016-10-05 18:04:35 +05:30 |
|
Nabin Hait
|
558f526a68
|
Fixed version conflict
|
2016-10-05 17:18:36 +05:30 |
|
Nabin Hait
|
7dcab89321
|
Merge branch 'hotfix'
|
2016-10-05 17:18:11 +05:30 |
|
Nabin Hait
|
a162b3f0cd
|
bumped to version 7.0.55
|
2016-10-05 17:48:11 +06:00 |
|
Nabin Hait
|
2f163ef360
|
Merge pull request #6552 from nabinhait/hotfix
Don't throw expense account validation on fetching item details
|
2016-10-05 17:17:05 +05:30 |
|
Nabin Hait
|
cccc45edc5
|
Don't throw expense account validation on fetching item details
|
2016-10-05 17:15:53 +05:30 |
|
Nabin Hait
|
7b9638c93a
|
Merge pull request #6551 from nabinhait/hotfix
Set warranty claim resolution date as today only if it is not set
|
2016-10-05 16:45:25 +05:30 |
|
Nabin Hait
|
33fafb7728
|
Set warranty claim resolution date as today only if it is not set
|
2016-10-05 16:43:20 +05:30 |
|
Nabin Hait
|
2704a4a8fc
|
Update production_order.py
|
2016-10-05 16:14:42 +05:30 |
|
Nabin Hait
|
7c0fe7d9d3
|
Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations
[Enhancement] Added supplier quotation link on rfq
|
2016-10-05 15:44:51 +05:30 |
|
Nabin Hait
|
55c328348f
|
Merge pull request #6547 from rohitwaghchaure/pos_issue_for_wildcard_seacrh
[Fix] POS wildcard search for customers, items.
|
2016-10-05 15:43:45 +05:30 |
|
Rohit Waghchaure
|
a26f685b9f
|
[Enhancement] Added supplier quotation link on rfq
|
2016-10-05 15:04:50 +05:30 |
|
Rohit Waghchaure
|
e86eaf543c
|
removed sync master data onload of the pos page
|
2016-10-05 14:45:15 +05:30 |
|
Rohit Waghchaure
|
163e3598c7
|
[Fix] POS wildcard search for customers, items
|
2016-10-05 13:52:17 +05:30 |
|
Nabin Hait
|
babafb8d01
|
Merge pull request #6531 from saurabh6790/je_currency_symbol_fix
[fix] currency symbol for total amount in JE
|
2016-10-05 13:12:59 +05:30 |
|
Nabin Hait
|
7229b64128
|
Merge pull request #6516 from bcornwellmott/patch-6
Update request_for_quotation.html
|
2016-10-05 13:12:09 +05:30 |
|
Nabin Hait
|
8db8a91d2e
|
Minor fixes
|
2016-10-05 13:11:19 +05:30 |
|
Kanchan Chauhan
|
f6f8ec68ad
|
Total and difference added for amount and qty
|
2016-10-05 13:11:19 +05:30 |
|
Rohit Waghchaure
|
712b871f06
|
Change project location in sales invoice
|
2016-10-05 12:45:56 +05:30 |
|
Nabin Hait
|
4784495db2
|
Merge pull request #6545 from neilLasrado/develop
Field rearrange in student applicant
|
2016-10-05 12:38:04 +05:30 |
|
Neil Trini Lasrado
|
d5035e05b3
|
Field rearrange in student applicant
|
2016-10-05 12:35:55 +05:30 |
|
Nabin Hait
|
9501b38e8b
|
Update remove_doctypes_and_reports.py
|
2016-10-05 12:35:11 +05:30 |
|
Nabin Hait
|
09adc10543
|
Merge pull request #6544 from nabinhait/hotfix
Sales Personwise transaction summary - total row
|
2016-10-05 12:27:21 +05:30 |
|
Nabin Hait
|
219148d23d
|
Sales Personwise transaction summary - total row
|
2016-10-05 12:26:51 +05:30 |
|
Nabin Hait
|
9ac2fc932d
|
Validate dates, fixes #6542
|
2016-10-05 12:20:25 +05:30 |
|