Commit Graph

16949 Commits

Author SHA1 Message Date
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
Kanchan Chauhan
fdcfe180ad [Fix] Better error message if default BOM not found 2016-11-21 11:29:18 +05:30
Kanchan Chauhan
d33c44e3a5 [Fix]Workstation holiday list 2016-11-21 11:23:01 +05:30
Rohit Waghchaure
a27c417e48 fix master data sync performance issue 2016-11-20 23:41:13 +05:30
Nabin Hait
cbd26e3b2c Manual Depreciation Schedule for Asset 2016-11-18 17:19:45 +05:30
Rohit Waghchaure
2a81960e0b test cases 2016-11-18 15:33:11 +05:30
Rohit Waghchaure
801029e055 Added item groups, customer groups in the POS profile. 2016-11-18 15:32:48 +05:30
Manas Solanki
60db98aaff [Minor] Variable assignment before reference
Variable = 'inspection_required_fieldname'
2016-11-18 14:52:13 +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
Manas Solanki
99dac07a56 [Fix] Minor fix for field rename 2016-11-18 12:52:34 +05:30
Nabin Hait
c29c5210f9 Merge pull request #6972 from RobertSchouten/bankstatement
[fix] update bank recon statement printing for payment entries
2016-11-18 12:50:40 +05:30
Nabin Hait
a3a59ea895 Merge pull request #6973 from RobertSchouten/bankrecon
[fix] layout for bank reconciliation
2016-11-18 12:49:16 +05:30
Nabin Hait
684d44385f Merge pull request #6991 from rohitwaghchaure/delivery_note_issue
[Fix] Delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item
2016-11-18 12:45:31 +05:30
Nabin Hait
eae077e05d Merge pull request #6989 from RobertSchouten/financialprint
[fix] financial printing and add to profitability
2016-11-18 12:44:50 +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
Rohit Waghchaure
e887e92dd4 Minor fix in delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item 2016-11-18 12:16:22 +05:30
robert schouten
0a1f3e4058 [fix] financial printing and add to profitability 2016-11-18 10:54:01 +08:00
Nabin Hait
05d0cd9574 Merge pull request #6982 from rohitwaghchaure/pos_is_pos_default_issue
[Fix] Onload pull pos profile data for IS POS invoice
2016-11-17 18:29:22 +05:30
Rohit Waghchaure
2ef7c7ae5c [Fix] Onload pull pos profile data for IS POS invoice 2016-11-17 17:29:10 +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
robert schouten
a943535520 [fix] update bank recon statement printing for payment entries 2016-11-17 14:33:28 +08:00
robert schouten
60fb1b8643 [fix] layout for bank reconciliation 2016-11-17 14:30:47 +08:00
ShraddhaRanjane
045bfe641e Update naming-series.md 2016-11-17 11:22:58 +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
Nabin Hait
8af429da1f Cleanup and fixes in quality inspection feature 2016-11-16 17:22:38 +05:30
Manas Solanki
55756d71b6 [Fix] Change of module of quality inspection 2016-11-16 17:22:38 +05:30