lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,106 Commits 43 Branches 150 Tags 886 MiB
84653f70be
Commit Graph

44106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
84653f70be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-02 21:16:56 +01:00
Laurent Destailleur
5a18904bb4 Fix: Infinite loop 2014-11-02 21:16:31 +01:00
Laurent Destailleur
2b8abf2794 Fix: Missing label 2014-11-02 20:07:38 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
b74bdb8f7d Fix: Bad error message 2014-11-02 11:39:30 +01:00
Laurent Destailleur
a1a10edc30 Merge pull request #1987 from IonAgorria/soap-client-order 
Added SOAP client for creating a client order in remote webservice
 2014-11-01 21:14:19 +01:00
Laurent Destailleur
167ec6917a Can add prefix into generated filename. This will save time for script 
to build kit of files for book keeper.
 2014-11-01 20:15:51 +01:00
Laurent Destailleur
762eb1cd48 Style were lost 2014-11-01 20:04:01 +01:00
Laurent Destailleur
b8faed9fe8 Fix: translation 2014-11-01 19:50:56 +01:00
Ion Agorria
82aa8458bf Added ws url/key to thirdparty SQL table, class and info page 2014-10-31 17:46:11 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
Ion Agorria
557cbaf3d7 Added module descriptor and activation checks 
Corrected 3 missing $error_occurred flags
 2014-10-31 04:59:57 +01:00
Laurent Destailleur
24862d6314 Corrections launchpad 2014-10-30 22:51:06 +01:00
Laurent Destailleur
6e0e812531 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-30 19:28:43 +01:00
Laurent Destailleur
2f5c7e5f9d Prepare version 3.7 beta 2014-10-30 19:28:22 +01:00
Laurent Destailleur
4226c27ccf Merge pull request #1965 from frederic34/patch-4 
On/Off for Object (do not restrict to product)
 2014-10-30 18:21:50 +01:00
Laurent Destailleur
a035d7d176 Merge branch 'AMMD-agenda-export-by-project' into develop 2014-10-30 18:20:00 +01:00
Laurent Destailleur
d5f21caca6 Update doc 2014-10-30 18:19:41 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into 
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
 2014-10-30 18:19:13 +01:00
Laurent Destailleur
871c4f1b20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-10-30 18:16:06 +01:00
Laurent Destailleur
82812aa679 Merge pull request #1970 from FHenry/develop 
Add hook method to simply display child lines in order/invoice/propal
 2014-10-30 18:11:41 +01:00
Laurent Destailleur
3e12239f11 Merge pull request #1971 from defrance69/patch-25 
Update commondocgenerator.class.php
 2014-10-30 18:10:52 +01:00
Laurent Destailleur
fb4858a5d3 Update changelog 2014-10-30 18:07:09 +01:00
Laurent Destailleur
058a7a9743 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-30 18:04:51 +01:00
Laurent Destailleur
9d9a1e0701 Merge pull request #1974 from grandoc/develop 
encrease name length for societe
 2014-10-30 18:04:38 +01:00
Laurent Destailleur
6a1a0303d8 Merge pull request #1975 from frederic34/patch-1 
"Is Order shippable" icon
 2014-10-30 18:03:44 +01:00
Laurent Destailleur
28c0c55780 Merge pull request #1977 from atm-maxime/develop 
Add : statistics on supplier orders and invoices on home page
 2014-10-30 17:59:07 +01:00
Laurent Destailleur
80581b2908 Merge pull request #1978 from atm-maxime/3.6 
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
 2014-10-30 17:56:22 +01:00
Laurent Destailleur
f7552c83d2 Fix: Must ignore such fields 2014-10-30 17:50:34 +01:00
Laurent Destailleur
d6c1b71350 Merge pull request #1983 from atm-maxime/mkoevols 
Fixes on extrafields, product supplier prices and user / company association deletion
 2014-10-30 17:49:53 +01:00
Laurent Destailleur
87901d07de Merge pull request #1986 from jfefe/patch-7 
Update makepack-dolibarr.pl : indentation
 2014-10-30 17:47:21 +01:00
Laurent Destailleur
c15191375a Merge pull request #1984 from frederic34/patch-3 
No thirdparty name in contract list
 2014-10-30 17:36:24 +01:00
Laurent Destailleur
23e9e228c7 Merge pull request #1988 from ilizaran/patch-1 
Update server_invoice.php
 2014-10-30 17:32:35 +01:00
Laurent Destailleur
38a939771c New: Add template of emails into dictionnary. 2014-10-30 17:16:51 +01:00
Laurent Destailleur
a5700c8f44 Ajout log 2014-10-30 12:20:48 +01:00
Laurent Destailleur
2dc1cb7c27 Fix: Use correct permission on correct field. 2014-10-30 12:19:38 +01:00
Laurent Destailleur
3ffd4432df New: Add permissions to read all trips and expenses. 2014-10-30 11:43:57 +01:00
Laurent Destailleur
47c2dc4fcf Fix: Can see only trip allowed. 2014-10-30 11:36:04 +01:00
Laurent Destailleur
8821fbac76 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/product/fiche.php
	htdocs/user/class/user.class.php
 2014-10-30 11:19:29 +01:00
Laurent Destailleur
8248ab4f9a Fix: doxygen 2014-10-30 11:16:45 +01:00
Laurent Destailleur
750944d718 Fix: var not initialised 2014-10-30 11:16:01 +01:00
Laurent Destailleur
106b4a669f id_parent and id_children was not set. 
So introduce new method to return same with no risk to break current
working code to address this.
 2014-10-30 11:15:13 +01:00
Laurent Destailleur
65b73ab778 Fix: td balance 2014-10-29 20:24:33 +01:00
Laurent Destailleur
a0c9af2385 New: Can filter on date into tab "Referring object" of a project. 2014-10-29 20:21:24 +01:00
Laurent Destailleur
3243958a70 New: getNomUrl can point to different page for tasks 2014-10-29 18:01:51 +01:00
Ignacio José Lizarán Rus
fa61faec58 Update server_invoice.php 
Create Facture with mode_reglement and cond_reglement using thirdparty information.
 2014-10-29 17:43:01 +01:00
Ion Agorria
e875f0c2b8 Fixed missing separator 2014-10-29 05:33:59 +01:00
Ion Agorria
4ff570571e Added SOAP client for creating a client order in remote 
webservice that thirdparty might have.
 2014-10-29 05:13:15 +01:00
jfefe
a32817db9d Update makepack-dolibarr.pl : indentation 2014-10-28 23:49:54 +01:00
Laurent Destailleur
1669700148 Uniformize and clean boxes behaviour and translation. 2014-10-27 21:49:51 +01:00