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

44698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2517d54196 Merge pull request #1989 from aternatik/fix_resource 
Missing translate key into resource module
 2014-10-30 17:32:02 +01:00
Laurent Destailleur
38a939771c New: Add template of emails into dictionnary. 2014-10-30 17:16:51 +01:00
Teddy
6e3d984e5b Merge pull request #2 from Dolibarr/develop 
MAJ BRANCHE DEV
 2014-10-30 14:38:16 +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
jfefe
e370ffb2d4 Bad function call 2014-10-30 01:33:39 +01:00
jfefe
c5045a75d8 Missing trans key into resource module 2014-10-30 01:16:37 +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
Florian HENRY
834a6dc2af webservice Thirdparty parameter lastname for invidual creation is now 
lastname and not ref
 2014-10-28 16:50:44 +01:00
Laurent Destailleur
1669700148 Uniformize and clean boxes behaviour and translation. 2014-10-27 21:49:51 +01:00
Laurent Destailleur
0abeea059e Uniformize and clean boxes behaviour and translation. 2014-10-27 21:48:28 +01:00
Florian HENRY
d846dd2431 Fix extrafield from list feature where filter is provided 2014-10-27 19:38:27 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Frédéric FRANCE
0775744b37 No thirdparty name in contract list 2014-10-27 18:27:46 +01:00
Maxime Kohlhaas
8b179c0d2a Fix : typo 2014-10-27 14:02:37 +01:00
Laurent Destailleur
31d8f792e5 Better responsive design POS 2014-10-27 13:21:33 +01:00
Laurent Destailleur
dd20d04002 Fix: Must use active tag of vat, not county table. 2014-10-27 12:59:19 +01:00
Maxime Kohlhaas
7b7b7e79e9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols 
Conflicts:
	htdocs/core/lib/company.lib.php
 2014-10-27 11:17:44 +01:00
Maxime Kohlhaas
fda32f6638 FixDosFiles 2014-10-27 11:16:18 +01:00
Alexis Algoud
eebf107d5f includes and show_documents 2014-10-27 10:54:50 +01:00
Maxime Kohlhaas
a5739c248e Fix : Product supplier prices were not working anymore due to bad SQL 2014-10-27 10:23:33 +01:00
Maxime Kohlhaas
42008fcf98 Fix : remove associated users when company is deleted 2014-10-27 10:22:21 +01:00
Maxime Kohlhaas
efd99a6f44 Fix : extrafield errors 2014-10-27 10:20:35 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Laurent Destailleur
badf379489 Fix: [ bug #1618 ] PHP Error thrown when saving a barcode 2014-10-27 01:56:06 +01:00
Laurent Destailleur
2b08417b77 Fix: [ bug #1612 ] Adding free product line line with negative qty in 
credit notes, doesn't give error message
 2014-10-27 01:51:33 +01:00
Laurent Destailleur
9619c0cdea Fix: [ bug #1581 ] SQL injection possbile 2014-10-27 00:58:56 +01:00
Laurent Destailleur
7bd27a13fa Fix: missing host and port into object 2014-10-26 19:41:06 +01:00
aspangaro
1405c03f7d Fix: Civility & birthdate wasn't save into adherent module 2014-10-26 06:48:08 +01:00
MAxime Kohlhaas
cb2744a866 Merge branch '3.6' of github.com:atm-maxime/dolibarr into 3.6 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
 2014-10-25 19:23:48 +02:00
MAxime Kohlhaas
374b761fdf Fix : product list was wrong on supplier invoice because fourn_id is not fetched 2014-10-25 19:20:02 +02:00
MAxime Kohlhaas
26ccb79f24 Fix : product list was wrong on supplier invoice because fourn_id is not fetched 2014-10-25 19:13:13 +02:00
MAxime Kohlhaas
3a626d8503 Add : statistics on supplier orders and invoices on home page 2014-10-25 17:22:03 +02:00
MAxime Kohlhaas
c8378b6b84 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-10-25 16:51:13 +02:00
Frédéric FRANCE
64a5a260dd Update admin.lang 2014-10-25 11:54:38 +02:00
Frédéric FRANCE
e08146d053 Update list.php 2014-10-25 11:37:39 +02:00
Frédéric FRANCE
68fa6cec70 Update commande.php 2014-10-25 11:34:21 +02:00
Laurent Destailleur
a1a03a8061 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 01:20:59 +02:00