Commit Graph

265 Commits

Author SHA1 Message Date
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Laurent Destailleur
8d63c2f9c5 Fix: ref_ext was not loaded
Conflicts:
	htdocs/contact/class/contact.class.php
2013-10-08 00:44:55 +02:00
Laurent Destailleur
a690ae05f6 Fix: ref_ext was not loaded 2013-10-08 00:42:40 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
414ab39d30 Fix: bug detected with phpunit 2013-09-09 02:37:11 +02:00
Florian Henry
34d4c15d0e Fix bug on category contact 2013-09-05 21:03:03 +02:00
lalaina rasamoelina
8a4041e534 T975-develop Add an element (statut) in the table llx_socpeople
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b Put the status of contact in the list of contact 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
83d5c1a441 Printing of contact 2013-08-22 11:04:05 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
09317e2034 Fix: Pb with firstname/lastname and font size 2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779 Fix: Pb with firstname/lastname and font size 2013-06-19 18:08:05 +02:00
Laurent Destailleur
f0aac521d0 Fix: civility label 2013-06-18 23:28:55 +02:00
Laurent Destailleur
66e0f80aa2 Fix: civility label 2013-06-18 23:28:03 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
df6c796413 Fix: [ bug #889 ] Titre civilité ne s'affiche 2013-05-12 17:09:48 +02:00
Laurent Destailleur
8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php
2013-05-07 13:08:30 +02:00
Regis Houssin
3aa049b661 Fix: regression 2013-05-06 17:57:33 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
Laurent Destailleur
4a9ed428f0 Fix: isset on scalar value 2013-04-30 09:58:30 +02:00
Grand Philippe
1d52d50ac1 fix: issue from last commit 2013-04-28 12:17:04 +02:00
Grand Philippe
647956576d fix some indefined index 2013-04-28 08:21:46 +02:00
Regis Houssin
3b934118c5 Fix: security problem with multicompany 2013-04-26 12:36:02 +02:00
Regis Houssin
016b4a2baa Fix: security problem with multicompany 2013-04-26 12:35:31 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
6739ac4d94 Fix: Restore backward compatibility 2013-04-10 15:53:40 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
5c3e6de073 Qual: Mutualize code. Only one function to build address format. 2013-04-07 17:39:08 +02:00
Laurent Destailleur
f22b1d3678 Enhance specimens 2013-04-06 03:40:55 +02:00
Laurent Destailleur
bd1d9b719b More generic specimen data 2013-04-06 00:37:20 +02:00
eldy
9d047d740b Fix: no null into not null field 2013-03-06 21:30:37 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-06 21:28:50 +01:00
eldy
9b8dd94751 Fix: no null into not null field 2013-03-06 21:26:05 +01:00
Grand Philippe
a080021511 fix : deprecated 2013-03-06 17:17:34 +01:00
Laurent Destailleur
6692c1072a Merge pull request #696 from jfefe/develop
Fix : bad sql request for cp field
2013-02-26 11:07:16 -08:00
jfefe
428ba7feaf Fix : bad sql request for cp field 2013-02-26 12:41:52 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
382d216d54 english language standardization 2013-02-23 15:58:26 +01:00
Grand Philippe
fb54bceafb english standardization 2013-02-22 16:53:50 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
Grand Philippe
ab2b06117b fix trad : change adresse versus address 2013-02-15 19:56:51 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +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
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
fhenry
2d2aaad1b0 Manage Extrafields deletion for contact 2012-12-16 23:18:20 +01:00
Regis Houssin
9079c1fb3b Fix: phpunit error 2012-12-03 09:58:18 +01:00
fhenry
f7b6f44767 oops, correct version 2012-11-30 04:51:11 +01:00
fhenry
1315e9a2ba Add import_key attribute into contact class creation SQL request 2012-11-30 04:40:06 +01:00