Commit Graph

45118 Commits

Author SHA1 Message Date
BENKE Charles
83b27c33d8 add contact tabs on company
appair only if MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES is enabled
display on tabs adherent list of company
2014-08-02 10:03:53 +02:00
BENKE Charles
250e8aacaf Update company.lib.php 2014-08-02 09:58:23 +02:00
Laurent Destailleur
6ff57e57c2 Fix: external link is visible when a module is using tabhelp of
dictionary.
2014-08-02 00:34:54 +02:00
Laurent Destailleur
6a815dd585 Fix: external link is visible when a module is using tabhelp of
dictionary.
2014-08-02 00:34:15 +02:00
Laurent Destailleur
7c1af329f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2014-08-01 22:26:17 +02:00
Laurent Destailleur
be76fd93fd New: Add user of creation and validation on invoice export 2014-08-01 22:24:25 +02:00
Juanjo Menent
eee17589b2 Fix: Price by customer: a client must be able to have multiple products
with customer prices
2014-08-01 18:24:38 +02:00
Juanjo Menent
c15da5f257 Fix: Price by customer: a client must be able to have multiple products
with customer prices
2014-08-01 18:22:39 +02:00
Laurent Destailleur
41f846ac6e Fix: Bad param 2014-08-01 17:13:23 +02:00
Laurent Destailleur
1c39e7ecbd Fix: Bad param 2014-08-01 17:11:18 +02:00
Florian HENRY
b0011d0514 remove debug 2014-08-01 16:50:47 +02:00
Florian HENRY
767ca07374 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 16:48:59 +02:00
Florian HENRY
17e272c8ac Fix extrafield parameters for sellist 2014-08-01 16:48:16 +02:00
fmarcet
67a7a210fd Fix: Optimieze Price by Customer 2014-08-01 16:17:31 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with
enter keyboard input instead of lens click)
2014-08-01 15:21:29 +02:00
Andrelec1
7318d0fbc0 Highliting IBAN (sepa)
Highliting IBAN code in pdf ( SEPA )
2014-08-01 15:13:21 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Florian HENRY
8f8c6a9c9e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-01 14:56:30 +02:00
Laurent Destailleur
ed52fc20d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-01 14:51:58 +02:00
Laurent Destailleur
605919be76 Fix: Too many parameter
Fix: Can't delete bank account
2014-08-01 14:51:40 +02:00
Andrelec1
0b5707c1cf Add Reduction value in pdf
Add value of %reduction in pdf
2014-08-01 14:49:42 +02:00
Laurent Destailleur
c6d491b0b9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 14:49:24 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Juanjo Menent
268aabbacd Fix: Price by customer 2014-08-01 13:27:54 +02:00
Juanjo Menent
32e110b6d9 Fix: Price by customer 2014-08-01 13:25:29 +02:00
Laurent Destailleur
a5a7fb4967 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-01 11:15:45 +02:00
Laurent Destailleur
e18caccdc9 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-01 11:14:02 +02:00
Laurent Destailleur
6917b97420 Fix: Missing link.lang file into transifex sync. 2014-08-01 11:13:13 +02:00
Maxime Kohlhaas
d2016632e6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-08-01 10:26:42 +02:00
Maxime Kohlhaas
23974daca4 Fix : shipping list SQL request was not filtering on shipping element 2014-08-01 09:57:08 +02:00
Maxime Kohlhaas
94fee7af70 Call trigger added in commonobjectline 2014-08-01 08:59:08 +02:00
Laurent Destailleur
cf72c05a99 Fix: debian package provided by dolibarr team use embedded libraries. 2014-08-01 02:11:37 +02:00
Laurent Destailleur
f58da0fa73 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/langs/fr_FR/main.lang
2014-08-01 02:05:38 +02:00
Laurent Destailleur
33a60bc14e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 02:02:14 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Laurent Destailleur
96a4aa2d26 Fix: phpunit 2014-08-01 01:31:52 +02:00
Laurent Destailleur
852b78f79f Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for
constants into database driver classes.
2014-08-01 00:53:29 +02:00
Laurent Destailleur
bdc9d5b463 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-01 00:34:24 +02:00
Laurent Destailleur
b1e3ac5181 Track we renamed getmypid into dol_getmypid. 2014-08-01 00:29:13 +02:00
Laurent Destailleur
1e09200347 Prepare to add foreign key toward parent into table
llx_accountingaccount.
2014-07-31 20:49:50 +02:00
Laurent Destailleur
b78537730a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 20:39:03 +02:00
Laurent Destailleur
218fb88eef Merge pull request #1788 from aspangaro/develop-accounting2
Accountancy :: account_parent must be an int (again)
2014-07-31 20:17:49 +02:00
Laurent Destailleur
9fff30416a Qual: Remove usage of getStaticMember function dir constants. 2014-07-31 20:12:21 +02:00
Laurent Destailleur
202774de0b Merge pull request #1791 from frederic34/patch-graphbox
External user must not have graph box with all stats
2014-07-31 17:51:31 +02:00
Laurent Destailleur
41865f934c Merge pull request #1794 from frederic34/patch-1
Update propal.php
2014-07-31 17:50:14 +02:00
Laurent Destailleur
0b2b84a50d Merge branch 'grandoc-develop' into develop 2014-07-31 17:48:12 +02:00
Laurent Destailleur
59e98f97e3 Merge branch 'develop' of github.com:grandoc/dolibarr into
grandoc-develop

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2014-07-31 17:47:32 +02:00
Laurent Destailleur
212e9825a3 Qual: Function getmypid were renamed into dol_getmypid. 2014-07-31 17:35:58 +02:00
Laurent Destailleur
95da79108f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-31 17:22:37 +02:00