Nabin Hait
|
97b661f995
|
Merge pull request #6334 from RobertSchouten/patch-27
[fix] itemwise sales register add sales invoice to delivery note when…
|
2016-09-12 17:53:10 +05:30 |
|
Nabin Hait
|
9821816e6c
|
Merge pull request #6337 from RobertSchouten/patch-28
[fix] status updater percent when qty is minus value
|
2016-09-12 17:37:48 +05:30 |
|
Nabin Hait
|
0a7c0f4418
|
Merge pull request #6338 from RobertSchouten/report_names
add customer and supplier names to some reports
|
2016-09-12 17:36:46 +05:30 |
|
Nabin Hait
|
014c30c90d
|
Merge pull request #6339 from rohitwaghchaure/pos_enhancement
[Enhancement] POS changes and fixes
|
2016-09-12 17:35:40 +05:30 |
|
Nabin Hait
|
d220298e69
|
Merge pull request #6343 from PawanMeh/fixes_6195
[fix] #6195
|
2016-09-12 17:34:40 +05:30 |
|
bcornwellmott
|
6594c841a7
|
Added color coding to timesheet calendars (#6269)
|
2016-09-12 16:43:23 +05:30 |
|
pawan
|
af111e9c43
|
[fix] #6195
|
2016-09-12 15:16:23 +05:30 |
|
Rohit Waghchaure
|
60a05324ce
|
POS changes and fixes
|
2016-09-12 13:11:10 +05:30 |
|
Nabin Hait
|
294664b24c
|
Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
|
2016-09-12 13:03:14 +05:30 |
|
robert schouten
|
4fc70d962b
|
add customer and supplier names to some reports
|
2016-09-12 15:23:51 +08:00 |
|
RobertSchouten
|
db33ebb0ff
|
[fix] status updater percent when qty is minus value
|
2016-09-12 14:54:46 +08:00 |
|
RobertSchouten
|
bd979ec1ed
|
[fix] itemwise sales register add sales invoice to delivery note when update stock
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
|
2016-09-12 09:46:10 +08:00 |
|
Saurabh
|
b835fef8ac
|
[enhancement] modify payment request to get payment url (#6097)
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
|
2016-09-09 11:19:22 +05:30 |
|
Nabin Hait
|
e5d13f3156
|
Update set_student_guardian.py
|
2016-09-08 17:57:55 +05:30 |
|
Nabin Hait
|
fff6e19479
|
Merge pull request #6318 from neilLasrado/develop
Rearranged fields in Student Applicant & Student, Split address field
|
2016-09-08 16:51:30 +05:30 |
|
Neil Trini Lasrado
|
1e060e98c5
|
Rearranged feilds in Student Applicant & Student, Split address feild
|
2016-09-08 16:12:39 +05:30 |
|
Nabin Hait
|
d97200cb5a
|
fixed version conflict
|
2016-09-07 17:20:45 +05:30 |
|
Nabin Hait
|
a8b8d81e2a
|
Merge branch 'hotfix'
|
2016-09-07 17:20:14 +05:30 |
|
Nabin Hait
|
3e669ca656
|
bumped to version 7.0.42
|
2016-09-07 17:50:14 +06:00 |
|
Nabin Hait
|
1bf8e70339
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:19:27 +05:30 |
|
Nabin Hait
|
7c9d981614
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:17:47 +05:30 |
|
Nabin Hait
|
0a0df2e433
|
fixed version conflict
|
2016-09-07 17:01:47 +05:30 |
|
Nabin Hait
|
1bdffbff57
|
Merge branch 'hotfix'
|
2016-09-07 17:01:17 +05:30 |
|
Nabin Hait
|
094d3adba3
|
bumped to version 7.0.41
|
2016-09-07 17:31:17 +06:00 |
|
Nabin Hait
|
6a5751e91c
|
Merge pull request #6311 from nabinhait/patch_hotfix_1
Patch fixed
|
2016-09-07 17:00:29 +05:30 |
|
Nabin Hait
|
23147ff881
|
Patch fixed
|
2016-09-07 16:59:55 +05:30 |
|
Nabin Hait
|
c16c0ca944
|
Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:59:32 +05:30 |
|
Rohit Waghchaure
|
525900c5c1
|
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:01:08 +05:30 |
|
pawan
|
7b2bd20a09
|
[fix] #6254
|
2016-09-06 18:28:41 +05:30 |
|
Nabin Hait
|
b8b228ed14
|
Fixed version conflict
|
2016-09-06 17:56:32 +05:30 |
|
Nabin Hait
|
75a41a6f75
|
Merge branch 'hotfix'
|
2016-09-06 17:55:55 +05:30 |
|
Nabin Hait
|
9b54b78794
|
bumped to version 7.0.40
|
2016-09-06 18:25:55 +06:00 |
|
Nabin Hait
|
e5480f4545
|
Merge pull request #6300 from neilLasrado/develop
Fixed Student Guardian patch - reload issue
|
2016-09-06 17:54:06 +05:30 |
|
Neil Trini Lasrado
|
52891b55d2
|
Fixed Student Guardian patch - reload issue
|
2016-09-06 17:50:42 +05:30 |
|
Nabin Hait
|
93851df048
|
Merge pull request #6299 from nabinhait/patch_fix_800
Patch fixed
|
2016-09-06 17:49:53 +05:30 |
|
Nabin Hait
|
f79d7188de
|
Patch fixed
|
2016-09-06 17:47:19 +05:30 |
|
Nabin Hait
|
1830675481
|
Merge pull request #6295 from rohitwaghchaure/supplier_quotation_uom_conversion_issue
[Issue] Fixed, supplier quotation item uom conversion
|
2016-09-06 17:30:08 +05:30 |
|
Rohit Waghchaure
|
b44efef094
|
[Issue] Fixed, supplier quotation item uom conversion
|
2016-09-06 17:21:38 +05:30 |
|
Nabin Hait
|
541e8504a6
|
Merge pull request #6294 from neilLasrado/develop
Fixed Student Guardian patch - permission issue
|
2016-09-06 17:20:12 +05:30 |
|
Neil Trini Lasrado
|
6a95723a70
|
Fixed Student Guardian patch - permission issue
|
2016-09-06 17:11:13 +05:30 |
|
Nabin Hait
|
194fbaca13
|
Merge pull request #6291 from RobertSchouten/patch-21
fix for closing balance typo
|
2016-09-06 17:06:56 +05:30 |
|
Nabin Hait
|
06792a93cd
|
Merge pull request #6289 from KanchanChauhan/barcode-in-stock-reconciliation
Barcode added to Stock Reconciliation
|
2016-09-06 17:06:06 +05:30 |
|
Nabin Hait
|
b830ffc7d5
|
Merge pull request #6245 from neilLasrado/develop
Forms redesign for Schools Module.
|
2016-09-06 17:05:02 +05:30 |
|
Neil Trini Lasrado
|
49da25dd57
|
Added patch
|
2016-09-06 15:45:17 +05:30 |
|
RobertSchouten
|
5ae21053bd
|
fix for closing balance typo
|
2016-09-06 15:44:09 +08:00 |
|
Neil Trini Lasrado
|
c20adb532f
|
Added student Category
|
2016-09-06 13:08:07 +05:30 |
|
Neil Trini Lasrado
|
d878b66936
|
Updated Student Doctype
|
2016-09-06 13:08:07 +05:30 |
|
Neil Trini Lasrado
|
a477e411aa
|
Updated Guardian Doctype; Added new fields
|
2016-09-06 13:08:07 +05:30 |
|
Kanchan Chauhan
|
366ba04823
|
Barcode added to Stock Reconciliation
|
2016-09-06 12:44:57 +05:30 |
|
Nabin Hait
|
3cdc74e3b0
|
Merge pull request #6286 from rohitwaghchaure/pos_name
[POS] Added offline_pos_name in print format
|
2016-09-06 11:38:51 +05:30 |
|