2
0
forked from Wavyzz/dolibarr
Commit Graph

593 Commits

Author SHA1 Message Date
Laurent Destailleur
315e2e4c13 Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into
defrance69-patch-14

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-10-20 14:12:56 +02:00
Laurent Destailleur
2f1340a6c6 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/societe/class/societe.class.php
2013-10-18 12:19:12 +02:00
Laurent Destailleur
9bc0f54ae8 Fix: set of country 2013-10-15 20:51:44 +02:00
Laurent Destailleur
603c2aa938 Qual: Removed not used file 2013-10-08 21:35:44 +02:00
Laurent Destailleur
c235c4e4ba Fix: security sql injection 2013-10-07 22:50:27 +02:00
Laurent Destailleur
3f94af792b Fix: security sql injection 2013-10-07 22:49:33 +02:00
BENKE Charles
2360dc52dd Update societe.class.php 2013-10-06 17:21:10 +02:00
BENKE Charles
7828219787 Update societe.class.php 2013-10-06 17:19:18 +02:00
BENKE Charles
f52e9812fa Update societe.class.php 2013-09-27 22:12:12 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
7ed5d5e543 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-23 11:25:06 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Cédric Salvador
e0295cefc1 get thirdparty's contacts as Contact objects 2013-09-20 10:38:17 +02:00
BENKE Charles
4a2ef0810d Update societe.class.php 2013-09-17 10:33:47 +02:00
Laurent Destailleur
b150e03b06 Fix: bad merge.
Fix: Restore backward compatibility. Add option hideifdisabled for call
that does not need disabled users.
2013-09-02 00:47:30 +02:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-09-01 15:01:33 -07:00
Florian Henry
9ed5653ae5 [ task #1044 ] Add option to enabled thirdparty number into select
thirdparty list
2013-08-30 18:18:58 +02:00
lalaina rasamoelina
fcd6985196 T966-develop : Put the poste of the contact in the list
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
2013-08-29 10:32:28 +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
dc3ccf6373 Style of page 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178 Delete the contact who are gone,in the email list 2013-08-22 11:04:06 +02:00
Laurent Destailleur
3a209afa94 Update societe.class.php
Add missing space
2013-08-08 01:54:08 +02:00
Laurent Destailleur
bf95cf40d9 Merge pull request #1164 from PaulPoulain/966-develop
T966-develop : Put the poste of the contact in the list
2013-08-07 16:51:27 -07:00
lalaina rasamoelina
c0d3ed0d60 T966-develop : Put the poste of the contact in the list
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
2013-08-07 10:17:18 +02:00
Maxime Kohlhaas
dae36229a4 Task # 1011 : add payment terms and payment mode on supplier card 2013-07-30 15:06:57 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Marcos García
4532399026 CR Fix
I'm getting tired of these commits...
2013-06-19 09:26:20 +02:00
Laurent Destailleur
326387ab75 Fix: Missing lang 2013-06-17 15:00:40 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
2a96172294 Fix: Pb in synchro update 2013-05-25 18:12:00 +02:00
Laurent Destailleur
f16026b79c Fix: cyclic updates 2013-05-25 18:11:54 +02:00
Laurent Destailleur
99c657255e Fix: Bug erase member data 2013-05-25 18:11:42 +02:00
Laurent Destailleur
44268903a0 Fix: Pb in synchro update 2013-05-25 18:01:50 +02:00
Laurent Destailleur
c36f8a0149 Fix: cyclic updates 2013-05-25 17:28:31 +02:00
Laurent Destailleur
06f6f48147 Fix: Bug erase member data 2013-05-25 17:14:56 +02:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
Laurent Destailleur
1f0adfaff5 Can remove an element from category when on category view. 2013-04-21 23:44:33 +02:00
Laurent Destailleur
4876aee493 Fix: Fix bad fix of SOCIETE_CODEFOURNISSEUR_ADDON 2013-04-11 20:32:09 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
7d2b11aff5 Qual: Remove a deprecated page, replaced by a more direct combo box. 2013-04-08 19:26:45 +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
bf23efda21 Fix: Bad error management 2013-04-04 09:17:03 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00