Laurent Destailleur
|
1978eebb69
|
Fix bad merge
|
2015-12-13 17:33:20 +01:00 |
|
Laurent Destailleur
|
4a88c9ea9f
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/product/class/product.class.php
|
2015-12-13 15:53:57 +01:00 |
|
Laurent Destailleur
|
3fea57f83b
|
Merge pull request #4192 from GPCsolutions/3.6-3930
Fix #3930 Removed executable bit
|
2015-12-11 16:42:25 +01:00 |
|
Raphaël Doursenaud
|
4e9b339439
|
[Qual] Removed PHP closing tag
|
2015-12-09 13:28:45 +01:00 |
|
Raphaël Doursenaud
|
c0862762a5
|
Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
|
2015-12-09 13:28:36 +01:00 |
|
Laurent Destailleur
|
a209d18649
|
FIX Can use formated float number on old expense report module.
|
2015-12-06 19:51:28 +01:00 |
|
Laurent Destailleur
|
b3ed99ddc1
|
Merge pull request #4146 from fmarcet/3.6
FIX: Not delete a product when have customer price
|
2015-12-04 18:24:37 +01:00 |
|
Laurent Destailleur
|
00aa5aace7
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
dev/codesniffer/ruleset.xml
|
2015-12-04 12:14:24 +01:00 |
|
Laurent Destailleur
|
d2b221cfd1
|
Upgrade PHPCS rules
|
2015-12-04 10:22:27 +01:00 |
|
fmarcet
|
eb98bd1e78
|
FIX: Not delete a product when have customer price
|
2015-12-03 14:02:26 +01:00 |
|
Laurent Destailleur
|
7105fabb79
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
|
2015-12-03 12:51:49 +01:00 |
|
Laurent Destailleur
|
1694481df8
|
Merge pull request #4134 from FHenry/3.7
FIX : Use "WHERE true" instead of "WHERE 1" #4132
|
2015-12-03 11:58:23 +01:00 |
|
Laurent Destailleur
|
a7020506aa
|
Merge pull request #4123 from aspangaro/3.7-accountancy
Fix : accountancy code on finance journal is not a constant
|
2015-12-03 11:55:08 +01:00 |
|
Florian HENRY
|
bd632cf2b0
|
FIX : Use "WHERE true" instead of "WHERE 1" #4132
|
2015-12-02 12:12:26 +01:00 |
|
aspangaro
|
b1122b55d4
|
Fix : accountancy code on finance journal is not a constant
|
2015-11-30 21:07:27 +01:00 |
|
Laurent Destailleur
|
e72f4cb063
|
Merge pull request #4102 from fmarcet/3.6
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
|
2015-11-28 16:27:16 +01:00 |
|
Laurent Destailleur
|
ae87a270e4
|
Merge pull request #4101 from aspangaro/3.7-accountancy
Fix #4069 Accountancy - button "export" don't work on finance journal
|
2015-11-28 16:26:36 +01:00 |
|
Laurent Destailleur
|
2ce00b2956
|
Merge pull request #4099 from GPCsolutions/3.6-4097
FIX #4097 Public holiday calculation
|
2015-11-28 16:11:28 +01:00 |
|
fmarcet
|
208bf2545f
|
Fix: Bug when idprof is mandatory on thrid creation and we use
multicompany
|
2015-11-26 17:14:03 +01:00 |
|
aspangaro
|
37da315af6
|
Remove old code
|
2015-11-26 06:30:09 +01:00 |
|
aspangaro
|
9a2259c681
|
Correct button 'Export' and 'Write bookkeeping' on finance journal
|
2015-11-26 06:19:24 +01:00 |
|
Laurent Destailleur
|
041fa8d3f3
|
Merge pull request #4083 from GPCsolutions/3.6-4081
FIX #4081 Added missing translation
|
2015-11-26 00:16:46 +01:00 |
|
aspangaro
|
8c0dffd24e
|
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
|
2015-11-25 20:23:41 +01:00 |
|
Raphaël Doursenaud
|
973e42d10f
|
FIX #4097 Public holiday calculation
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
|
2015-11-25 19:34:11 +01:00 |
|
Raphaël Doursenaud
|
91ce70a6e9
|
FIX #4081 Added missing translation
|
2015-11-23 17:25:10 +01:00 |
|
Laurent Destailleur
|
d64664f5a7
|
Merge pull request #4057 from marcosgdf/bug-3734
FIX #3734 Do not show empty links of deleted source objects in stock movement list
|
2015-11-21 17:49:41 +01:00 |
|
Laurent Destailleur
|
c04743aa84
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-11-21 12:23:51 +01:00 |
|
Marcos García de La Fuente
|
9f27e2323f
|
FIX #3734 Do not show empty links of deleted source objects in stock movement list
|
2015-11-21 11:51:23 +01:00 |
|
Laurent Destailleur
|
c77eaeaa77
|
Merge pull request #4040 from atm-arnaud/3.6_fix_export_category_contact
FIX export with category contact extrafields
|
2015-11-21 02:09:32 +01:00 |
|
Laurent Destailleur
|
07d24a9a05
|
Merge pull request #4044 from atm-arnaud/3.7_fix_project_box_nb_task
FIX Nb of tasks and percent progress in box project
|
2015-11-21 02:08:00 +01:00 |
|
arnaud
|
07226d32ec
|
FIX NB task and percent progress in box project
|
2015-11-20 16:11:48 +01:00 |
|
arnaud
|
4233d24f4b
|
FIX export with category contact extrafields
|
2015-11-19 18:01:58 +01:00 |
|
Juanjo Menent
|
a627e32fca
|
Merge pull request #4034 from fmarcet/3.7
FIX Not use localtaxes when invoice some orders
|
2015-11-18 23:07:24 +01:00 |
|
Juanjo Menent
|
6c379029fa
|
Merge pull request #4033 from atm-arnaud/3.7_fix_project_box
FIX product link in project box
|
2015-11-18 23:06:08 +01:00 |
|
fmarcet
|
f615927d24
|
FIX Not use localtaxes when invoice some orders
|
2015-11-18 17:56:04 +01:00 |
|
arnaud
|
85a58f666a
|
FIX product link in project box
|
2015-11-18 17:22:53 +01:00 |
|
aspangaro
|
06f752b250
|
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
|
2015-11-16 06:50:04 +01:00 |
|
Laurent Destailleur
|
bad28c6d92
|
Fi sntax error
|
2015-11-13 11:44:55 +01:00 |
|
Laurent Destailleur
|
eac80d7db4
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
|
2015-11-13 11:43:29 +01:00 |
|
Laurent Destailleur
|
c7546dbad2
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-11-13 11:13:04 +01:00 |
|
Laurent Destailleur
|
b3be7f65cd
|
Fix syntax error . = instead of .=
|
2015-11-13 11:12:49 +01:00 |
|
Laurent Destailleur
|
f65829ec42
|
Merge pull request #3970 from hregis/3.7_bug
Fix: wrong var name
|
2015-11-12 18:33:12 +01:00 |
|
Regis Houssin
|
52bd90f950
|
Fix: wrong var name
|
2015-11-12 14:12:56 +01:00 |
|
Laurent Destailleur
|
350345ecca
|
Prepare 3.6.5
|
2015-11-08 15:18:26 +01:00 |
|
Laurent Destailleur
|
722a133b31
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
|
2015-11-08 15:09:57 +01:00 |
|
Laurent Destailleur
|
d4aeb8b3bc
|
Abandon package APS. Was never used.
|
2015-11-08 14:57:26 +01:00 |
|
Laurent Destailleur
|
04aba8ce96
|
Abandon package APS. Was never used.
|
2015-11-08 14:56:36 +01:00 |
|
Laurent Destailleur
|
9b8bb114cd
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2
Conflicts:
ChangeLog
|
2015-11-08 14:55:12 +01:00 |
|
Laurent Destailleur
|
c639e82062
|
FIX Add a protection to not make release if ChangeLog was not generated.
Conflicts:
ChangeLog
|
2015-11-08 14:45:56 +01:00 |
|
Laurent Destailleur
|
e6ab6bdb8e
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-11-08 14:38:01 +01:00 |
|