frederic34
f2d7523091
Optioncss
2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4
Optioncss not kept in list
2015-10-04 10:45:57 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Laurent Destailleur
60c0338d64
FIX #3628
2015-10-01 16:50:18 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
c726afe3bc
Merge pull request #3592 from GPCsolutions/select_users
...
[Qual] Replaced deprecated select_users()
2015-09-26 08:44:34 +02:00
Raphaël Doursenaud
b0b552c378
[Qual] Replaced deprecated select_users()
2015-09-24 20:32:35 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Laurent Destailleur
313d9ddacd
FIX #3534
2015-09-16 22:04:03 +02:00
Laurent Destailleur
5d34f787a3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/conf.class.php
2015-09-03 10:51:17 +02:00
Laurent Destailleur
5fd6c44640
Fix error management
2015-08-31 13:00:24 +02:00
fappels
6d02c48c49
Fix batch expedition
2015-08-27 19:52:43 +02:00
Laurent Destailleur
e24fd6fa37
Merge remote-tracking branch 'origin/develop' into 3.8
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2015-08-20 14:36:32 +02:00
fappels
38584f2cfa
Fix shipment validation 2 times qty in SQL select
2015-08-19 10:42:54 +02:00
philippe grand
20a4304188
the form should be outside table to avoid errors
2015-08-15 16:10:24 +02:00
philippe grand
ece6d1bf02
the form should be outside table to avoid errors
2015-08-15 11:21:50 +02:00
Laurent Destailleur
3bdd342df1
Fix #3116
2015-08-14 23:53:59 +02:00
Laurent Destailleur
d408193657
Fix: When stock is empty, no information was visible to explain why
...
create button does not work.
2015-08-14 20:37:20 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Juanjo Menent
5177c5f227
fix #3338 broken links on shippment card
2015-08-07 09:27:46 +02:00
Maxime Kohlhaas
9e05cecc1a
Fix : rowid was missing on expedition line so no origin id when creating an invoice
2015-07-31 16:31:12 +02:00
Laurent Destailleur
5ca6593a57
Fix serious deadlock feature. It was possible to link with no way to
...
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Laurent Destailleur
a9289de616
Several fixes. Fix #2927
2015-07-13 11:22:18 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
Laurent Destailleur
5fafb08f91
Uniformize code
2015-07-04 04:11:16 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Regis Houssin
e3d1614004
Fix: ereg more simple
2015-06-11 09:21:44 +02:00
Regis Houssin
14780747fc
Merge remote-tracking branch 'dolibarr/3.7' into 3.7
2015-06-10 16:00:42 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Regis Houssin
8d824785f0
Merge remote-tracking branch 'dolibarr/3.7' into 3.7
2015-06-08 10:03:34 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
2015-06-05 16:50:46 +02:00
Regis Houssin
5139954365
Fix: add filter in "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034_Original filename""
2015-06-04 16:39:39 +02:00
Laurent Destailleur
f437bd2d6d
FIX No check warehouse is provided if module stock is not enabled.
2015-06-03 21:21:20 +02:00
Florian HENRY
fb29fa486a
FIX : total amount in tpl linked object are not reset
2015-06-02 11:20:08 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
03acb1a8c9
Uniformize way to report error after "buildoc" action.
2015-05-19 00:01:30 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Laurent Destailleur
fe3f701928
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
htdocs/expedition/list.php
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/user/class/user.class.php
2015-05-16 17:09:42 +02:00
Laurent Destailleur
976211b70f
Look enhancement
2015-05-15 12:53:14 +02:00
Maxime Kohlhaas
942564be56
Fix : bad link when sorting shipment list #2823
2015-05-12 22:36:34 +02:00
Raphaël Doursenaud
aee61aa2c4
[Qual] Fixed deprecated HTML nowrap attribute to class
2015-05-12 15:37:35 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
