Commit Graph

16805 Commits

Author SHA1 Message Date
Nabin Hait
d97ec828b5 Merge pull request #7113 from rohitwaghchaure/edit_serial_no
Allow user to edit serial no for credit note, debit note
2016-12-01 18:06:58 +05:30
Nabin Hait
1f1ffd79e2 Merge pull request #7109 from RobertSchouten/project_wise
[fix] Project wise Stock Tracking is script report
2016-12-01 16:12:46 +05:30
Nabin Hait
c92e2f9044 Update project_wise_stock_tracking.json 2016-12-01 16:12:35 +05:30
Rohit Waghchaure
2e8a94458d allow user to edit serial no for credit note, debit note 2016-12-01 16:04:41 +05:30
Nabin Hait
79f0a97431 Merge pull request #7112 from KanchanChauhan/salary-slip-issue
[Fix] Fixed condition and formula issue in Salary Slip
2016-12-01 15:56:52 +05:30
Kanchan Chauhan
faa525e4f1 [Fix] Fixed condition and formula issue in Salary Slip 2016-12-01 15:31:38 +05:30
robert schouten
81a5467c8f [fix] Project wise Stock Tracking is script report 2016-12-01 09:02:17 +08:00
Nabin Hait
de932911b5 Merge branch 'hotfix' 2016-11-28 14:22:54 +05:30
Nabin Hait
edfca16931 bumped to version 7.1.20 2016-11-28 14:52:54 +06:00
Nabin Hait
50a240e758 Merge pull request #7061 from rohitwaghchaure/cost_center_issue
[Fix] Cost center group not showing data in the P&L report
2016-11-28 12:42:48 +05:30
Nabin Hait
96be3dd4f4 Merge pull request #7082 from rohitwaghchaure/pos_qty_issues
[Fix] Wrong actual qty showing in POS
2016-11-28 12:39:09 +05:30
Nabin Hait
1880fc46d3 Merge pull request #7084 from nabinhait/hotfix
Multiple minor fixes
2016-11-28 12:38:48 +05:30
Nabin Hait
a78c463e97 Multiple minor fixes 2016-11-27 16:32:41 +05:30
Rohit Waghchaure
80f5bb6a6c [Fix] Wrong actual qty showing in POS 2016-11-27 12:04:12 +05:30
Nabin Hait
d0839799c1 Update workstation.py 2016-11-26 09:54:00 +05:30
Rohit Waghchaure
bca0d73e1c [Fix] Cost center group not showing data in the P&L report 2016-11-25 14:54:34 +05:30
Nabin Hait
14823d0d0f Merge pull request #7066 from rohitwaghchaure/pos_barcode_search_issue
[fix] Barcode and special character issue in the search box of the POS
2016-11-25 11:20:55 +05:30
Rohit Waghchaure
9a36083095 [fix] Barcode and special character issue in the search box of the POS 2016-11-25 11:17:48 +05:30
Nabin Hait
1e3d14fda7 Merge pull request #7051 from rohitwaghchaure/v7_timesheet_cleanup
cleanup timesheet and fix sales invoice total timesheet billing amount
2016-11-24 13:06:04 +05:30
Rohit Waghchaure
8c4e45ab3d cleanup timesheet 2016-11-23 17:54:47 +05:30
Nabin Hait
6fc850d071 Merge branch 'hotfix' 2016-11-23 16:00:22 +05:30
Nabin Hait
580534a22a bumped to version 7.1.19 2016-11-23 16:30:22 +06:00
Nabin Hait
297d74a997 Unlink payment entries on cancellation of invoice 2016-11-23 15:59:00 +05:30
Nabin Hait
b8a7926464 Merge branch 'hotfix' 2016-11-23 14:53:42 +05:30
Nabin Hait
7f540af7a6 bumped to version 7.1.18 2016-11-23 15:23:42 +06:00
Nabin Hait
b18ad55e2b minor fixes 2016-11-23 14:51:30 +05:30
Nabin Hait
b439afb5e5 Merge pull request #7045 from saurabh6790/root_type_fix_and_other
[fix] Root type fix
2016-11-23 14:46:05 +05:30
Nabin Hait
cf895c220c Update account_tree.js 2016-11-23 14:44:07 +05:30
Saurabh
9342f650e0 [fix] remove root type selection while created new node and hooks call to initialize payment gateway 2016-11-23 14:06:14 +05:30
Nabin Hait
b91aed807a Merge pull request #7042 from RobertSchouten/naming_series
[fix] naming series only show non disabled role doctypes
2016-11-23 13:26:19 +05:30
robert schouten
085706bcbf [fix] naming series only show non disabled role doctypes 2016-11-23 13:57:21 +08:00
Rushabh Mehta
8685225644 Merge branch 'hotfix' 2016-11-22 23:18:28 +05:30
Rushabh Mehta
6557e37d5c bumped to version 7.1.17 2016-11-22 23:48:28 +06:00
Rushabh Mehta
698c040d21 [hot] fix quotation (#7039) 2016-11-22 23:16:40 +05:30
Nabin Hait
c381327e6e Merge pull request #7032 from rohitwaghchaure/patch_issue
fix patch
2016-11-22 13:51:51 +05:30
Rohit Waghchaure
334f032780 fix patch 2016-11-22 13:30:13 +05:30
Nabin Hait
ee874a2a36 Update student_admission.py 2016-11-22 12:42:24 +05:30
Nabin Hait
8132be288f Merge branch 'hotfix' 2016-11-21 19:10:05 +05:30
Nabin Hait
d75d3a927d bumped to version 7.1.16 2016-11-21 19:40:05 +06:00
Nabin Hait
651d8e996b Merge pull request #7020 from nabinhait/balance_sheet_fix
Provisional Loss related fix in Balance Sheet. Fixed #6918
2016-11-21 19:06:42 +05:30
Nabin Hait
d01d74cafd Merge pull request #7019 from nabinhait/fix_10014
Default warehouse is mandatory only for stock item in POS. Fixed #6893
2016-11-21 19:06:30 +05:30
Nabin Hait
9789b50ae5 Merge pull request #7018 from nabinhait/fix_10013
Set project from Sales Order while creating Material Request from PPT, fixed #6731
2016-11-21 19:06:14 +05:30
Nabin Hait
5224a04628 Merge pull request #7016 from nabinhait/fix_10012
Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636
2016-11-21 19:05:50 +05:30
Nabin Hait
bdab3103e3 Merge pull request #7015 from nabinhait/fix_10011
Multiple fixes
2016-11-21 19:05:34 +05:30
Nabin Hait
376e8945f7 Merge pull request #7014 from rohitwaghchaure/rename_autoname_field
patch for rename autoname field
2016-11-21 19:04:44 +05:30
Nabin Hait
3d5ef804b2 Provisional Loss related fix in Balance Sheet. Fixed #6918 2016-11-21 18:53:05 +05:30
Nabin Hait
977eff911f Default warehouse is mandatory only for stock item in POS. Fixed #6893 2016-11-21 18:29:16 +05:30
Nabin Hait
9b797974b5 Set project from Sales Order while creating Material Request from PPT, fixed #6731 2016-11-21 18:15:50 +05:30
Nabin Hait
075e33245e Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636 2016-11-21 18:09:55 +05:30
Nabin Hait
fd23fa7c0b Prifitability report link added to accounts module page 2016-11-21 16:59:03 +05:30