Laurent Destailleur
|
67a1bf2b59
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-09-26 14:13:26 +02:00 |
|
Laurent Destailleur
|
3d8722ee69
|
FIX #2853
|
2016-09-12 02:19:25 +02:00 |
|
Juanjo Menent
|
9f4ccfab95
|
FIX #3815 With higher quality
|
2016-04-15 15:54:51 +02:00 |
|
Juanjo Menent
|
c5ecc46a22
|
FIX #3815 With higher quality
|
2016-04-15 15:42:58 +02:00 |
|
Juanjo Menent
|
4446e6a36c
|
FIX #3815 Call to undefined function local_by_date(). branch 3.8
|
2016-04-15 12:47:21 +02:00 |
|
Juanjo Menent
|
2d3b2c08b5
|
FIX #3815 Call to undefined function local_by_date(). branch 3.7
|
2016-04-15 10:56:03 +02:00 |
|
Laurent Destailleur
|
93be4305c4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
|
2015-11-13 12:18:46 +01:00 |
|
Marcos García de La Fuente
|
01854b3259
|
FIX #3679 Error when deleting a Localtax2 special payment
|
2015-11-07 13:51:09 +01:00 |
|
Laurent Destailleur
|
87e07a3038
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
|
2015-06-14 17:18:45 +02:00 |
|
Marcos García de La Fuente
|
200eb7b1bb
|
FIX Close bug #2855 Wrong translation key in localtax report page
|
2015-06-12 16:27:17 +02:00 |
|
Raphaël Doursenaud
|
aee61aa2c4
|
[Qual] Fixed deprecated HTML nowrap attribute to class
|
2015-05-12 15:37:35 +02:00 |
|
Laurent Destailleur
|
56a14da5d4
|
FIXME that are not bug are replaced with TODO
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
|
2015-04-12 04:01:28 +02:00 |
|
aspangaro
|
d69f066735
|
QUAL: Traduce terms + remove <center>
|
2015-03-15 14:04:07 +01:00 |
|
Laurent Destailleur
|
e3713c8b6d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
|
2015-02-19 00:01:26 +01:00 |
|
Marcos García de La Fuente
|
0d6d98b395
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:17:37 +01:00 |
|
frederic34
|
f4161b457b
|
Add dol_escape_htmltag and start to adapt boxes
|
2015-01-22 00:23:55 +01:00 |
|
frederic34
|
1b0dd671b3
|
Add tooltip in getNomUrl link
|
2015-01-20 21:40:33 +01:00 |
|
Laurent Destailleur
|
e24a668c52
|
Merge pull request #2225 from frederic34/psr2
Psr2
|
2015-01-09 22:53:06 +01:00 |
|
frederic34
|
60661ae948
|
Add some "classfortooltip"
|
2015-01-09 00:07:54 +01:00 |
|
frederic34
|
73fda2cb86
|
WIP PSR2
|
2015-01-08 18:36:03 +01:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Laurent Destailleur
|
445f696d28
|
Fix: Pb of object with wrong type.
|
2014-11-15 18:24:38 +01:00 |
|
Laurent Destailleur
|
97eec37f1c
|
Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
|
2014-10-04 17:20:17 +02:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|
Laurent Destailleur
|
605919be76
|
Fix: Too many parameter
Fix: Can't delete bank account
|
2014-08-01 14:51:40 +02:00 |
|
Marcos García de La Fuente
|
ec661d0c6c
|
Removed index.php and replaced them with blank index.html as it is more appropriate
|
2014-07-12 23:18:57 +02:00 |
|
KreizIT
|
c1a004106d
|
Refactor: LOCALTAXE_* trigger
|
2014-07-11 14:47:44 +02:00 |
|
Laurent Destailleur
|
90a5f6c7ef
|
Qual: Remove end php tag.
|
2014-07-08 01:02:30 +02:00 |
|
Juanjo Menent
|
74b42f6cb4
|
[ task #1063 ] Allow edit localtaxes rate for thirds
|
2014-07-04 17:31:34 +02:00 |
|
Juanjo Menent
|
65d303999f
|
[ task #1063 ] Allow edit localtaxes rate for thirds
|
2014-07-04 17:26:21 +02:00 |
|
Laurent Destailleur
|
be4fe3d0d0
|
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
|
2014-07-04 13:43:50 +02:00 |
|
Juanjo Menent
|
747b6a9f94
|
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports
and payments
|
2014-07-04 12:50:55 +02:00 |
|
Marcos García de La Fuente
|
56abf1cd72
|
Removed duplicated SQL error logging
|
2014-06-13 02:28:30 +02:00 |
|
Marcos García de La Fuente
|
9fbd7806f0
|
More substitutions
|
2014-06-12 11:31:53 +02:00 |
|
Raphaël Doursenaud
|
c48c3a9d91
|
Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
|
2014-05-26 13:51:25 +02:00 |
|
Raphaël Doursenaud
|
f8f502d013
|
Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
|
2014-05-03 18:18:44 +02:00 |
|
Juanjo Menent
|
a1fb21114b
|
New: Add some hooks for financial reports
|
2014-03-28 18:31:43 +01:00 |
|
Laurent Destailleur
|
cafa61ef7d
|
Fix: Use correct syntax of date into sql requests (with quotes)
|
2014-03-15 23:12:00 +01:00 |
|
Raphaël Doursenaud
|
e762042828
|
Fixed typos
|
2013-09-05 18:06:51 +02:00 |
|
Laurent Destailleur
|
d802470aae
|
I killed <td nowrap>. Hello <td class="nowrap"> !
|
2013-07-19 14:23:42 +02:00 |
|
Grand Philippe
|
b599481ef6
|
standardize code
|
2013-06-20 09:18:12 +02:00 |
|
Laurent Destailleur
|
4e0ef01389
|
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
|
2013-04-25 01:13:13 +02:00 |
|
Grand Philippe
|
b081589129
|
english language standardization
|
2013-02-25 09:52:24 +01:00 |
|
Laurent Destailleur
|
8d206fdfb0
|
Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
|
2013-01-16 15:36:08 +01:00 |
|
Marcos García
|
ad5d2c3459
|
Added missing translations, improved es_ES translations and translated untranslated text in modules admin page
|
2013-01-05 19:23:16 +01:00 |
|
Regis Houssin
|
43c0a03758
|
Fix: strict mode tornado
|
2012-09-15 11:21:22 +02:00 |
|
Regis Houssin
|
e19f8c54f1
|
Fix: strict mode hurricane
|
2012-09-15 10:01:35 +02:00 |
|
Marcos García
|
4209898d20
|
Lower-cased Header function
|
2012-08-31 05:58:38 +02:00 |
|
Laurent Destailleur
|
8a42cc26b7
|
Fix: Bad syntax of class name
|
2012-08-27 18:00:59 +02:00 |
|
Marcos García
|
9b3c89ac47
|
Removed parenthesis from all include and include_once and replaced with single quotes
|
2012-08-23 02:40:41 +02:00 |
|