lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,554 Commits 43 Branches 150 Tags 886 MiB
0bf7dd0686
Commit Graph

45554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
37d22d1e94 Merge branch 'marcosgdf-patch-2' into develop 2014-07-31 17:22:04 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
Philippe Grand
5aea97affd Update fournisseur.commande.class.php 
missing code for extrafields
 2014-07-31 17:02:17 +02:00
frederic34
5f80e9ed20 Update propal.php 
Correct typo
 2014-07-31 16:52:00 +02:00
Maxime Kohlhaas
b2ad8c74a5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-31 15:19:20 +02:00
Laurent Destailleur
c70a7ee63a Merge pull request #1787 from frederic34/patch-facture 
User must not see invoices if no rights
 2014-07-31 14:38:46 +02:00
Laurent Destailleur
1e7b100770 Merge pull request #1792 from frederic34/getmypid 
Cannot redeclare getmypid()
 2014-07-31 14:38:00 +02:00
Maxime Kohlhaas
d8ede4147d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-31 11:55:36 +02:00
Regis Houssin
977300c653 Fix: missing skin.js 2014-07-31 11:15:30 +02:00
frederic34
6645b8a454 Cannot redeclare getmypid() 2014-07-31 10:21:47 +02:00
frederic34
50e3049fd7 External user must not have graph box with all stats 2014-07-30 17:10:08 +02:00
Marcos García de La Fuente
1c97b3f779 Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode 2014-07-30 15:47:19 +02:00
Marcos García de La Fuente
972d3c69b6 Removed duplicated requires. 
Json.lib.php is included with functions.lib.php
 2014-07-30 15:42:58 +02:00
Marcos García de La Fuente
42c7fc1c8d Revert "Testing dol_json_encode is not interesting now as it uses a core function" 2014-07-30 15:19:31 +02:00