Commit Graph

3698 Commits

Author SHA1 Message Date
Laurent Destailleur
af407a094a FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
2016-12-14 11:20:44 +01:00
Laurent Destailleur
c2bee0f937 FIX #6088 2016-12-07 12:44:56 +01:00
Regis Houssin
718adef600 Fix: external access of fkeditor image with multicompany 2016-11-04 10:21:20 +01:00
Regis Houssin
d0bd1d5d36 Fix: missing path of user photo 2016-10-28 14:22:06 +02:00
florian HENRY
3932a32399 FIX : #5629 PgSQL Interger string stylish error 2016-08-16 09:00:52 +02:00
florian HENRY
321814fae3 better fix for #5594 2016-08-09 15:17:19 +02:00
florian HENRY
90cb71f341 revert better fix 2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466 better test 2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411 FIX #5594 2016-08-08 13:43:44 +02:00
Laurent Destailleur
b3cdb1f163 FIX tag for date rfc in odt substitution 2016-07-29 16:21:28 +02:00
Marcos García de La Fuente
3029fd0fe1 FIX #5540 getFormMail is not registered as addReplace hook 2016-07-25 13:18:41 +02:00
Marcos García de La Fuente
3ef3a038cf Merge branch '3.9' into bug-5537 2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91 FIX #5537 AJAX project search does not work properly 2016-07-25 11:49:04 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:12:34 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Laurent Destailleur
c663ca13b8 Fix edit left menu 2016-06-01 21:41:47 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
2016-04-29 20:39:17 +02:00
Laurent Destailleur
0735413e7c Merge pull request #5101 from altatof/fix_fournprice_select
FIX: end of select when no fournprice
2016-04-29 20:36:44 +02:00
BENKE Charlie
31a9acc77d </option> not present in some select list 2016-04-29 20:18:26 +02:00
esprit libre
f5a541d469 Fix problem about unit buy price fetching
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
2016-04-29 19:41:47 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Florian HENRY
8035742779 FIX fetchAllEMailTemplate 2016-04-11 14:52:22 +02:00
Marcos García de La Fuente
b2f922291f FIX #4851 Project selector in supplier invoices shows the project label twice
Close #4851
2016-04-09 22:38:58 +02:00
Laurent Destailleur
80caf58866 FIX Default vat is not set correctly when an error occured and we use
VAT identified by a code.
2016-04-08 19:19:13 +02:00
Laurent Destailleur
39b61d6924 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/boxes/box_task.php
	htdocs/core/lib/files.lib.php
2016-04-07 19:27:53 +02:00
Florian HENRY
1f723cb8d0 FIX : Template email must take care of positino column 2016-04-07 14:16:10 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
cea48a8dd6 FIX bad translation language loaded
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
2016-04-03 20:02:02 +02:00
Laurent Destailleur
066c793de2 FIX image extension must be in lower case
Conflicts:
	htdocs/core/lib/files.lib.php
2016-04-02 15:46:01 +02:00
Laurent Destailleur
0715353960 FIX A not enabled field for list must not into fields to add 2016-03-25 19:44:18 +01:00
Laurent Destailleur
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +01:00
Laurent Destailleur
af3256f84a Fix first change to fix serious pb with vat definition when using the
POS.
2016-03-19 21:35:03 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was
broken.
2016-02-29 15:43:00 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
2e25c7969b Fix when setting a price for a product, selection of product must not
show any price
2016-02-26 12:22:32 +01:00
Laurent Destailleur
b072b5a181 Fix remove some warnings
Conflicts:
	htdocs/core/lib/pdf.lib.php
2016-02-26 10:45:25 +01:00
Laurent Destailleur
cfdaa0e13c Fix missing translation
Fix import of state
2016-02-22 14:49:30 +01:00
Laurent Destailleur
355f091246 FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE 2016-02-22 13:28:08 +01:00
Laurent Destailleur
7ff8c2c3db FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:31:42 +01:00
Laurent Destailleur
5d2c189e0e Fix bad place of table 2016-02-17 23:45:25 +01:00
Laurent Destailleur
d8e173af03 Fix regression (class not found, css on hover broken) with try to manage
contrast on categories.
2016-02-16 15:01:28 +01:00