Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-05 08:32:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,508 Commits 37 Branches 191 Tags
bf2d052d624a34be524b3ec4f84fa8d66eb2fd65
Commit Graph

814 Commits

Author SHA1 Message Date
Laurent Destailleur
f368ef377b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-07-20 16:02:15 +02:00
Laurent Destailleur
73b5302905 Fix var not defined 2019-07-20 16:00:16 +02:00
Laurent Destailleur
6594b361b1 Removed useless code 2019-07-20 15:56:20 +02:00
Laurent Destailleur
fea12c3c59 Fix class not found error 2019-07-20 15:55:22 +02:00
Laurent Destailleur
a900055631 Fix class not found error 2019-07-20 15:53:21 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1daac232b0 Code comment 2019-06-24 14:31:58 +02:00
Laurent Destailleur
e12fde398a Fix phpcs 2019-06-23 19:50:55 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
eb20df8e64 Fix debug save of state into setup 2019-06-22 14:47:46 +02:00
Laurent Destailleur
4721dc3d34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 11:57:39 +02:00
Laurent Destailleur
9644b9c669 Merge pull request #10932 from tony13tv/patch-6 
[CHANGE] Make State available in .odt templates...
 2019-06-22 11:26:32 +02:00
Laurent Destailleur
0bc0f8ae94 Fix translation of country 2019-06-21 15:40:35 +02:00
Laurent Destailleur
e60020140d Update societe.class.php 2019-06-20 04:11:10 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
ptibogxiv
23f4536a78 FIX : sync data thirdparty to member 2019-04-25 19:22:14 +02:00
Laurent Destailleur
d64e6a6a1b Merge branch 'develop' into patch-6 2019-04-25 02:54:03 +02:00
Laurent Destailleur
99639ef429 FIX #11013 2019-04-24 11:25:14 +02:00
Laurent Destailleur
f5fb8363d8 FIX #11041 2019-04-24 10:26:57 +02:00
Laurent Destailleur
2b87c8b663 Merge pull request #10810 from mwelters/patch-1 
NEW improve Expensereport, Inverse Receiver
 2019-04-08 14:04:08 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Cristian Torres
64e91fa25b [CHANGE] Making State available in .odt templates... 
...making use of the same strategy when loading Country info from single attribute.
Previously attempted on PR #10463 which has been closed

This also relates to #7428
 2019-03-27 17:09:59 -06:00
Josep Lluís
3d1ebb8379 FIX filter by name_alias field on fetch 
In fetch, when filtering by name_alias field, is used a wrong name of field (nom_alias)
 2019-03-27 13:41:29 +01:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Laurent Destailleur
40c2ca4310 Fix label of status of third party record when using smartphone 2019-03-15 23:08:00 +01:00
Laurent Destailleur
5027a36dfb Fix missing transaction on add_commercial method. 2019-03-15 19:34:04 +01:00
Christophe Battarel
ae50a8b896 change add_commercial signature 2019-03-12 10:48:08 +01:00
markus
c905575d3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-04 17:26:40 +01:00
Frédéric FRANCE
62501b11e8 add visibility 2019-03-02 00:14:22 +01:00
Laurent Destailleur
6373e1db84 Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
markus
d38bff6f14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-02-26 12:31:24 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Frédéric FRANCE
894123fb06 PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
markus
01b12793d2 fix typo in comment 2019-02-12 13:59:55 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
af92303319 Merge pull request #10487 from frederic34/psr2squizwhite 
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
 2019-02-08 09:30:25 +01:00
Laurent Destailleur
9e28db4202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
 2019-02-06 00:51:10 +01:00
Laurent Destailleur
ce5717a7b7 FIX Default language of company is not set 2019-02-05 20:43:26 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
markus
bc2c6282d9 Merge branch 'develop' of https://github.com/mwelters/dolibarr into develop 2019-02-03 17:48:04 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5 Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00