lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,950 Commits 43 Branches 150 Tags 886 MiB
31d3e419b2
Commit Graph

38950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
31d3e419b2 Fix: doxygen 2013-09-23 09:35:16 +02:00
Laurent Destailleur
9a475e9ed2 New: Add method to use a dictionnary as a combo box. 2013-09-22 23:54:01 +02:00
Laurent Destailleur
2bf4a2bdb8 Missing project label 2013-09-22 21:02:42 +02:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 20:01:33 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
44d2fbcb1a A better tag command 2013-09-22 19:41:14 +02:00
Laurent Destailleur
b9aac118aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-21 12:31:38 +02:00
Laurent Destailleur
fd564f5c7d Optimize cookie usage for boxes. Only 1 cookie per box, instead of 1 
cookie
per
parameter.
 2013-09-21 12:30:44 +02:00
Laurent Destailleur
16396b985b Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-21 10:54:34 +02:00
Laurent Destailleur
b74f73c885 Fix: Calculation of deposit amount when using a percent was done only on 
last line.
 2013-09-21 10:53:46 +02:00
Laurent Destailleur
78210d951d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-20 21:57:56 +02:00
Laurent Destailleur
bb2404c16d Remove duplicate file for distributions to avoid warnings 2013-09-20 21:57:33 +02:00
Laurent Destailleur
4cf3a5d632 Merge pull request #1243 from csalvador/htmlentities 
Htmlentities
 2013-09-20 12:18:57 -07:00
Laurent Destailleur
5d95877419 Merge pull request #1242 from csalvador/contact_array_objects 
get thirdparty's contacts as Contact objects
 2013-09-20 12:17:47 -07:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +02:00
Laurent Destailleur
0315cfdac6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/get-orig-source.sh
 2013-09-20 11:51:01 +02:00
Laurent Destailleur
7a1efdbab6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-20 11:06:09 +02:00
Cédric Salvador
81a9bc3960 checkstyle 2013-09-20 10:56:15 +02:00
Cédric Salvador
e0295cefc1 get thirdparty's contacts as Contact objects 2013-09-20 10:38:17 +02:00
Cédric Salvador
9fdac2aa8e changed dol_htmlentities() parameters to match standard htmlentities() 2013-09-20 10:36:43 +02:00
Laurent Destailleur
bd0e328d5b Use official package directly to build debian. 2013-09-19 23:51:47 +02:00
Laurent Destailleur
0b09493ecb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-19 23:42:30 +02:00
Laurent Destailleur
9ee9079d78 update doc 2013-09-19 23:05:48 +02:00
Laurent Destailleur
2a1dae78ca Fix: We must not remove sources from packages 2013-09-19 19:49:41 +02:00
Laurent Destailleur
42f5ca15df Fix: Add missing field info_bits into predefined invoices. 2013-09-19 14:58:35 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
a86e8f8fac Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-19 01:00:05 +02:00
Laurent Destailleur
848c693822 Fix: Error in url 2013-09-19 00:59:02 +02:00
Laurent Destailleur
8de0de08ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	build/debian/get-orig-source.sh
 2013-09-19 00:53:09 +02:00
Laurent Destailleur
847b0234c7 Change for debian 2013-09-19 00:49:51 +02:00
Laurent Destailleur
30c4d5dedb Fix for debian package 2013-09-19 00:39:13 +02:00
Laurent Destailleur
f5717c7384 Change for debian 2013-09-19 00:37:57 +02:00
Laurent Destailleur
986794ad7f Fix doxygen 2013-09-18 23:39:53 +02:00
Laurent Destailleur
d03714d6d6 Fix: select 2013-09-18 23:29:21 +02:00
Laurent Destailleur
369eabc69e Fix: bad condition 
Conflicts:
	htdocs/societe/societe.php
 2013-09-18 23:26:35 +02:00
Laurent Destailleur
1810433a93 Fix: bad condition 2013-09-18 23:24:09 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
04752dbfbe Doxygen: More comments 2013-09-18 17:59:57 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Laurent Destailleur
711146f5ea Merge pull request #1241 from atm-maxime/develop 
Fix : wrong contact list was used for cc and ccc in formmail
 2013-09-18 05:53:19 -07:00
Maxime Kohlhaas
e3d4a7bc35 Fix : wrong contact list was used for cc and ccc in formmail 2013-09-18 13:36:22 +02:00
Laurent Destailleur
d478d8c1fe Fix: Permission to read an event should depend on agenda module 
permissions.
We add a check for thirdparty for external users
 2013-09-18 11:56:42 +02:00
Laurent Destailleur
d3efd86e3d Fix: Syntax error 2013-09-18 00:33:49 +02:00
Laurent Destailleur
1e29a97a89 Fix: checkstyle 2013-09-17 21:12:34 +02:00
Laurent Destailleur
23c151ee14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-17 20:22:36 +02:00
Laurent Destailleur
c241fa1bfc Track error 2013-09-17 20:22:02 +02:00
simnandez
f7299f1a28 [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 18:06:06 +02:00
simnandez
c0b57fccaf [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 17:43:14 +02:00
simnandez
7f21e596dd [ task #1063 ] Allow edit localtaxes rate for thirds. Init Works 2013-09-17 17:17:59 +02:00