Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,474 Commits 36 Branches 190 Tags
5e34b121dd0445c908f37fa42e901b7af025dcaa
Commit Graph

2772 Commits

Author SHA1 Message Date
root
b3d58e9510 FIX large expense note 2016-06-08 14:36:52 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
gauthier
2aa688e6f2 NEW : tests for LEFT JOIN 2016-06-07 09:39:48 +02:00
gauthier
ff605a4cff Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_add_restrictions_on_exports 2016-06-06 17:51:51 +02:00
gauthier
a2df6dc59f NEW : add restrictions on standard exports (agenda, order, deplacement, facture, fournisseur) 2016-06-06 17:51:39 +02:00
gauthier
85740a618e NEW : add restrictions on standard exports (societe, propal, expedition) 2016-06-06 16:21:05 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
1f93425193 Merge pull request #5308 from atm-maxime/develop 
FIX #5044
 2016-06-06 13:35:59 +02:00
Laurent Destailleur
52fefc2d02 Debug module resource 2016-06-06 13:14:05 +02:00
Maxime Kohlhaas
caaffdb0c3 FIX #5044 2016-06-05 02:54:25 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
BENKE Charlie
7cd8e270cc Update export_csv.modules.php 2016-06-04 19:25:32 +02:00
BENKE Charlie
2f36611cad Update export_csv.modules.php 2016-06-04 19:22:15 +02:00
phf
c62a69ccc8 Merge branch 'fix_3.7_issue_2858' into develop 2016-06-04 18:54:55 +02:00
phf
3cbbdf5e20 Fix #2858 2016-06-04 18:23:22 +02:00
phf
01b881a0a6 Fix builddoc with odt lost value of extrafields as "sellist" on view card 2016-06-04 13:24:42 +02:00
Maxime Kohlhaas
857454a28d For each module, no default permission on activation 2016-06-04 12:16:30 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
BENKE Charlie
2a8f17bc40 Update export_csv.modules.php 2016-06-03 23:58:37 +02:00
BENKE Charlie
41856a920e if \n or \r we addquote too 2016-06-03 23:41:32 +02:00
Laurent Destailleur
537c9637f6 Merge pull request #5255 from atm-florian/dev_fix5151 
FIX: #5151
 2016-06-02 10:05:02 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax 
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
 2016-06-01 13:24:27 +02:00
Florian HENRY
ed05321438 comment don't need to be updated 2016-05-31 23:24:35 +02:00
Florian HENRY
3c42a32690 FIX: #5151 2016-05-31 23:22:15 +02:00
Laurent Destailleur
ed148f70b3 FIX Filter on assigned to was preselected on current user on list "All 
events" (instead of no filtering)
 2016-05-30 18:12:27 +02:00
Laurent Destailleur
3ddf427ff1 FIX Legal issue for GB. Add hidden option for this. 2016-05-30 00:52:16 +02:00
gauthier
1ce91bac06 FIX : same page added several times on mergepropal option 2016-05-25 11:25:19 +02:00
Laurent Destailleur
b476153b8b Move POS at end of top menu 2016-05-25 00:02:48 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Laurent Destailleur
b1bd6b5d6e Fix regression 2016-05-18 18:23:38 +02:00
Laurent Destailleur
cf8c180fa4 Fix perm and CRLF 2016-05-18 16:26:15 +02:00
Laurent Destailleur
f3cd4b3ee8 Fix doxygen 2016-05-18 14:43:56 +02:00
florian HENRY
4e98f57385 FIX : php strict warning 2016-05-17 09:02:22 +02:00
Laurent Destailleur
55e904bc01 Debug for expert accounting module 2016-05-12 20:45:05 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +02:00
Laurent Destailleur
aa55cdadac Merge pull request #4944 from FHenry/develop_advtargetemailiing 
NEW : Advance target emailing
 2016-05-05 23:18:27 +02:00
Laurent Destailleur
816dda5a8b Merge pull request #5158 from aspangaro/4.0-p29 
FIX: Accountancy - Little fix et add page to assign massively the category
 2016-05-05 22:52:20 +02:00
Laurent Destailleur
d50e9cde34 Merge pull request #5090 from atm-maxime/fix_pdffoot_details 
PDF foot details
 2016-05-05 21:09:46 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-05-02 20:40:42 +02:00
aspangaro
7749425468 Modify right to access on chart of accounts 2016-05-02 20:02:45 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of 
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
 2016-05-01 16:34:50 +02:00
Laurent Destailleur
b434dad21a Fix: remove a debug code 2016-04-29 18:34:56 +02:00
Laurent Destailleur
cea1c06f7d Merge pull request #4764 from benlo06/fr_4763 
FR4763 add possibility to export contacts/thirdparty categories
 2016-04-29 18:33:58 +02:00
Sergio Sanchis Climent
61fda99fc5 FIX Bug insert cronjobs in modules, default values 2016-04-29 01:13:10 +02:00
Maxime Kohlhaas
02aa3f5688 Debug double conf 2016-04-24 12:14:03 +02:00
Maxime Kohlhaas
651213123f Oups missing $conf 2016-04-23 17:45:38 +02:00
Maxime Kohlhaas
930b4a9be0 New var name 2016-04-23 17:36:55 +02:00
Maxime Kohlhaas
ad26fb2824 New option to show details in pdf page foot 2016-04-23 17:23:44 +02:00