lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,045 Commits 43 Branches 150 Tags 886 MiB
4958d17d24
Commit Graph

33600 Commits

Author SHA1 Message Date
BENKE Charles
b400803a2a Update commonobject.class.php 
add complementary param
 2013-09-25 10:15:32 +02:00
Laurent Destailleur
b6a083596a Merge remote-tracking branch 'origin/3.4' into develop 2013-09-24 20:21:32 +02:00
Laurent Destailleur
06f668a249 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-24 20:20:41 +02:00
Laurent Destailleur
a3e74afb02 Fix: varchar 256 2013-09-24 20:14:42 +02:00
Laurent Destailleur
12b15d3ae0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-24 18:23:02 +02:00
Laurent Destailleur
3378855694 New: Can cancel holidays that were previously validated 2013-09-24 18:06:07 +02:00
Christophe Battarel
b197231c04 fix bad margin calculation for credit notes 2013-09-24 17:49:56 +02:00
Christophe Battarel
f13b9cec29 escape dialog title 2013-09-24 15:59:30 +02:00
Christophe Battarel
aa820d56ba Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
is reverts commit 8a4041e534.

Conflicts:

	htdocs/core/lib/company.lib.php
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
	htdocs/societe/class/societe.class.php

Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2013-09-24 15:52:19 +02:00
BENKE Charles
d978d64d59 Update commonobject.class.php 
just the active type of contact
 2013-09-24 14:19:52 +02:00
Laurent Destailleur
2088eaa6fd Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-24 13:17:58 +02:00
Laurent Destailleur
a674af5bcd Fix: Permission check on event tabs 2013-09-24 11:11:59 +02:00
Laurent Destailleur
b6d5ebf81d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-24 11:02:01 +02:00
Laurent Destailleur
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
bdafcb680f Fix: Bad parameters 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-23 21:07:13 +02:00
Laurent Destailleur
99de8b22a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-23 19:59:52 +02:00
Laurent Destailleur
94f28a93de Fix: Bad parameters 2013-09-23 19:53:55 +02:00
Laurent Destailleur
890c96355d Check parameter to make bug detection seasier 2013-09-23 19:53:21 +02:00
Laurent Destailleur
6b2966794a Do not show free text for thirdparty email send form 2013-09-23 14:35:22 +02:00
Laurent Destailleur
9189bdfa01 Fix: bad translation 2013-09-23 13:28:26 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Laurent Destailleur
cb04b05e85 New: Can send an email from thirdparty card. 2013-09-23 13:17:31 +02:00
Laurent Destailleur
5341811ec0 Fix: Clean awful code 2013-09-23 12:31:10 +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
Maxime Kohlhaas
00cb2aa26c Fix : wrong var used in bank account class 2013-09-23 10:55:44 +02:00
Laurent Destailleur
26bce0a385 Merge pull request #1207 from defrance69/patch-12 
Update modProjet.class.php
 2013-09-23 00:39:03 -07:00
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
8024a61376 Add missing label 2013-09-22 21:07:00 +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
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
4cf3a5d632 Merge pull request #1243 from csalvador/htmlentities 
Htmlentities
 2013-09-20 12:18:57 -07:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29: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
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
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
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
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
Laurent Destailleur
e47165fa38 Merge pull request #1239 from csalvador/replenishment-fix 
Replenishment fix
 2013-09-16 10:39:35 -07:00
Laurent Destailleur
09de33ad97 Merge pull request #1232 from GPCsolutions/pgsql-installer 
Fixed SQL install script for PostgreSQL
 2013-09-16 10:39:11 -07:00
Laurent Destailleur
7e87c7f1cb Merge pull request #1227 from csalvador/natural_search 
natural search in list pages
 2013-09-16 10:38:16 -07:00
Laurent Destailleur
921777449f New: [ task #90 ] Barcode search 2013-09-16 17:10:49 +02:00
Cédric Salvador
967c20e3e9 Improved error message 2013-09-16 14:51:22 +02:00
Cédric Salvador
c62c7c0b1f Stock calculation was wrong in certain cases, should be ok now 2013-09-16 14:37:53 +02:00
Laurent Destailleur
01fb596555 New: [ task #90 ] Barcode search 2013-09-16 14:29:17 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
b0e03462d3 fixed empty being used on a function 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
5cbccd5fc0 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-16 13:44:37 +02:00
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice. 
Also added phpunit test to detect it if it occurs again.
 2013-09-16 13:42:42 +02:00
Laurent Destailleur
9826b202e9 New: Provide both tags for string formated amount and numeric amount 
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
 2013-09-16 12:42:01 +02:00
Laurent Destailleur
949b8c6274 Mark method classer_facturee deprecated. 
Make better translation of some workflow options.
 2013-09-16 11:50:53 +02:00
Christophe Battarel
33fbee51bd ability to copy contact address to clipboard 2013-09-15 19:09:22 +02:00
Christophe Battarel
a100faa4b1 ability to copy contact address to clipboard 2013-09-15 18:33:20 +02:00
Laurent Destailleur
efcab8a596 Merge pull request #1237 from altairis-fr/3.4 
Fix: Supplier price displayed on document lines and margin infos didnt take discount
 2013-09-15 06:57:22 -07:00
Christophe Battarel
775d259f88 Fix: Supplier price displayed on document lines and margin infos didnt take discount 2013-09-15 14:52:41 +02:00
Laurent Destailleur
b20b82df3d Fix: we must use conf-currency as parameter of method price instead of 
using langs->getCurrencySymbol
 2013-09-15 13:04:38 +02:00
Laurent Destailleur
c1b6e05cc0 Fix: bad sql syntax 2013-09-15 12:46:54 +02:00
Laurent Destailleur
5e969536c0 Fix: bad sql syntax 2013-09-15 12:34:22 +02:00
Laurent Destailleur
32d2615e93 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-15 12:18:35 +02:00
Laurent Destailleur
e970c01b1b Code comment 
Fix translation
 2013-09-15 12:17:45 +02:00
Christophe Battarel
d9d90f1088 Fix: Supplier price displayed on document lines didnt take discount 
Conflicts:
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-15 12:04:46 +02:00
simnandez
59783cf556 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:52:57 +02:00
simnandez
4c7907b773 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-15 11:47:31 +02:00
Christophe Battarel
6959ccf627 Fix: Supplier price displayed on document lines didnt take discount 2013-09-15 11:41:41 +02:00
Laurent Destailleur
57dee255a2 Normalize code 2013-09-14 14:41:12 +02:00
Laurent Destailleur
4c1faf626e Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 14:36:17 +02:00
Laurent Destailleur
914e167183 Fix: Bad sql request 2013-09-14 14:34:45 +02:00
Laurent Destailleur
cbc5b9137b Merge pull request #1235 from defrance69/patch-13 
Update html.formother.class.php
 2013-09-14 05:26:43 -07:00
Laurent Destailleur
443eba900a Fix: Bad translation 2013-09-14 12:52:04 +02:00
Laurent Destailleur
5344aadc2e Fix: Bad translation 2013-09-14 12:51:01 +02:00
BENKE Charles
5e9cb8a1d4 Update modProjet.class.php 
add export_dependencies_array
 2013-09-14 10:45:41 +02:00
BENKE Charles
085a8d68db Update html.formother.class.php 
bugfix
 2013-09-14 10:41:36 +02:00
Laurent Destailleur
f2bdd8c1d8 Work on alternative vat calculation mode 2013-09-13 17:43:26 +02:00
Laurent Destailleur
6ad569a511 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-13 16:21:02 +02:00
Laurent Destailleur
82f4d588fc Fix: Can't search on proposals 2013-09-13 16:17:19 +02:00
Laurent Destailleur
707bba3d7d Fix: W3C 2013-09-13 10:40:49 +02:00
Laurent Destailleur
b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php
 2013-09-13 09:32:41 +02:00
Laurent Destailleur
54976951a1 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-13 09:24:09 +02:00