Nabin Hait
|
e3649ec43c
|
Merge pull request #7005 from rmehta/ux-fixes-for-daily-works-summary
[minor] UX fixes for Daily Work Summary
|
2016-11-21 12:42:32 +05:30 |
|
Rushabh Mehta
|
557e7f787b
|
[minor] UX fixes for Daily Work Summary
|
2016-11-21 12:10:44 +05:30 |
|
Nabin Hait
|
5f453e7779
|
Merge pull request #6992 from rmehta/daily-work-summary
[Feature] Daily Work Summary
|
2016-11-18 14:00:08 +05:30 |
|
KanchanChauhan
|
49a50fef63
|
Group same item in SO print (#6959)
|
2016-11-18 13:57:53 +05:30 |
|
KanchanChauhan
|
dc2195c52a
|
[Documentation] Shopping Cart (#6911)
|
2016-11-18 13:56:06 +05:30 |
|
Nabin Hait
|
8704dd3134
|
Merge pull request #6970 from komsel2228/develop
fix bugs uom and conversion factor on stock entry
|
2016-11-18 12:56:41 +05:30 |
|
Rushabh Mehta
|
9dd58d42df
|
[fix] test cases and final wiring for daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Rushabh Mehta
|
c10d2a0025
|
[wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Rushabh Mehta
|
fe816c3852
|
[fix] [wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Nabin Hait
|
52f101d776
|
Merge pull request #6981 from neilLasrado/develop
Added ability to mark attendance against a Student Batch
|
2016-11-17 17:10:05 +05:30 |
|
Nabin Hait
|
652743b26e
|
Merge branch 'master' into develop
|
2016-11-17 16:41:52 +05:30 |
|
Nabin Hait
|
d79cca3ba7
|
Merge branch 'hotfix'
|
2016-11-17 16:41:51 +05:30 |
|
Nabin Hait
|
f83302836c
|
bumped to version 7.1.15
|
2016-11-17 17:11:51 +06:00 |
|
Nabin Hait
|
bd99a7cb5d
|
Merge pull request #6980 from shreyasp/setup-wizard-domain
[Fix] Updated 'FR' translation to prevent setup wizard failure
|
2016-11-17 16:07:43 +05:30 |
|
Nabin Hait
|
46753de6d7
|
fixed merge conflict
|
2016-11-17 15:55:11 +05:30 |
|
Nabin Hait
|
29570d1ecb
|
Merge branch 'hotfix'
|
2016-11-17 15:54:07 +05:30 |
|
Nabin Hait
|
f2b7ec919a
|
bumped to version 7.1.14
|
2016-11-17 16:24:07 +06:00 |
|
Nabin Hait
|
f76aab6021
|
Merge pull request #6976 from saurabh6790/advance_payment_entry_cancellation_fix
[fix] on advance payment entry cancellation delink invoice and pyamen…
|
2016-11-17 15:41:31 +05:30 |
|
Neil Trini Lasrado
|
d9bc5598b6
|
Added ability to mark attendance against a Student Batch
|
2016-11-17 15:36:14 +05:30 |
|
robert schouten
|
2b63e14089
|
dh drop guest from student attendance so disabling acedemic user disables all school doctypes (#6974)
|
2016-11-17 15:23:38 +05:30 |
|
Saurabh
|
1d210968de
|
[fix] on advance payment entry cancellation delink invoice and pyament entry references
|
2016-11-17 15:21:46 +05:30 |
|
Nabin Hait
|
d4e8b297cd
|
Merge pull request #6784 from RobertSchouten/calendar_fix
[fix] calendar range fixes
|
2016-11-17 14:45:59 +05:30 |
|
shreyas
|
0c93445be0
|
[Fix] Updated 'FR' translation to prevent setup wizard failure
|
2016-11-17 14:31:32 +05:30 |
|
Nabin Hait
|
7fc05d6432
|
Update update_missing_salary_component_type.py
|
2016-11-17 12:16:52 +05:30 |
|
Ignatius Cuknoris
|
6471057df4
|
fix bugs uom and conversion factor on stock entry
|
2016-11-17 10:31:19 +07:00 |
|
Nabin Hait
|
aa68058910
|
Updated modified_datetime in production planning tool
|
2016-11-16 17:41:08 +05:30 |
|
Nabin Hait
|
8dd859920f
|
Merge pull request #6960 from KanchanChauhan/thumbnail-in-shoppingcart
[Fix]Product thumbnail in Shopping Cart
|
2016-11-16 17:34:17 +05:30 |
|
Nabin Hait
|
7f6b99aca4
|
Merge pull request #6962 from KanchanChauhan/payroll-fixes
[Fix] Filters to get employee in Payroll
|
2016-11-16 17:34:00 +05:30 |
|
Nabin Hait
|
01dc2e412d
|
Merge pull request #6964 from mbauskar/hotfix
[minor] fixes in validate selling price
|
2016-11-16 17:32:11 +05:30 |
|
mbauskar
|
e9747a8a6e
|
[minor] fixes in validate selling price
|
2016-11-16 17:19:47 +05:30 |
|
Kanchan Chauhan
|
7652b857c8
|
[Fix] Filters to get employee in Payroll
|
2016-11-16 15:29:01 +05:30 |
|
Kanchan Chauhan
|
98f499a43e
|
[Fix]Product thumbnail in Shopping Cart
|
2016-11-16 15:17:55 +05:30 |
|
Nabin Hait
|
535462fc20
|
Merge pull request #6947 from saurabh6790/delink_jv_from_advance
[fix] delink jv from advance table
|
2016-11-16 14:22:03 +05:30 |
|
Nabin Hait
|
e346a499c7
|
Merge pull request #6956 from rohitwaghchaure/payment_entry_issue
[Fix] Payment entry, exchange rate is not set properly
|
2016-11-16 14:15:52 +05:30 |
|
Saurabh
|
8adbfa8a09
|
[test-case] test cases for delinking advance payments
|
2016-11-16 13:43:01 +05:30 |
|
Saurabh
|
866c295989
|
[fix] on jv cancel remove linkings from advance table of Sales/Purchase Invoice
|
2016-11-16 13:43:01 +05:30 |
|
Nabin Hait
|
6d04afc19d
|
fixed merge conflict
|
2016-11-16 12:56:31 +05:30 |
|
Nabin Hait
|
67bceef1cb
|
Merge branch 'hotfix'
|
2016-11-16 12:55:59 +05:30 |
|
Nabin Hait
|
38bfcaa203
|
bumped to version 7.1.13
|
2016-11-16 13:25:59 +06:00 |
|
Nabin Hait
|
00e841d744
|
update missing salary component abbr
|
2016-11-16 12:55:17 +05:30 |
|
Rohit Waghchaure
|
9b18ed4ffe
|
[Fix] Payment entry, exchange rate is not set properly
|
2016-11-16 12:24:40 +05:30 |
|
Rushabh Mehta
|
4bfa0748cd
|
[merge] master
|
2016-11-16 11:28:23 +05:30 |
|
Rushabh Mehta
|
d65d67e0a7
|
Merge branch 'hotfix'
|
2016-11-16 11:26:42 +05:30 |
|
Rushabh Mehta
|
a78bac61cc
|
bumped to version 7.1.12
|
2016-11-16 11:56:42 +06:00 |
|
rohitwaghchaure
|
48cb3d89b6
|
[Fix] Opening balance calculation issue for balance sheet (#6945)
|
2016-11-16 11:18:49 +05:30 |
|
Rushabh Mehta
|
8dfbe7c748
|
[fix] patch missing salary component type based on existing salary slips (#6955)
|
2016-11-16 11:18:20 +05:30 |
|
Shreyas Patil
|
99a3593a0d
|
[Fix] Make from_date and to_date for stock balance query report as mandatory fields (#6948)
|
2016-11-16 11:16:44 +05:30 |
|
rohitwaghchaure
|
7be942db54
|
[Fix] Status updater for sales order in purchase order (#6944)
|
2016-11-16 11:14:32 +05:30 |
|
Rushabh Mehta
|
24f658d633
|
[fix] [minor] accounts receivable not translated (#6943)
|
2016-11-16 11:13:46 +05:30 |
|
Rushabh Mehta
|
d51e1587d5
|
[fix] contact us page should create a opportunity by default (#6939)
|
2016-11-16 11:13:31 +05:30 |
|