lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,237 Commits 43 Branches 150 Tags 886 MiB
17cb6fa11f
Commit Graph

338 Commits

Author SHA1 Message Date
Alexis Algoud
8d0e5479a0 Rename var 2016-05-14 19:22:27 +02:00
Alexis Algoud
b46c14812c Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop 2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db NEW decrease stock on expedition closing/classifying 2016-04-25 18:33:39 +02:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
64514b38da Merge remote-tracking branch 'origin/3.9' into develop 2016-02-01 01:23:41 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
Laurent Destailleur
85898ec977 Fix bad test 2016-01-14 23:48:47 +01:00
Laurent Destailleur
fef3bed4ba Fix bad name of var 2016-01-14 13:32:31 +01:00
Laurent Destailleur
23e90974c4 Prepare to split module supplier into supplier_order and 
supplier_invoice
 2016-01-14 13:24:49 +01:00
Bahfir Abbes
ce49c0d5dc Update conf.class.php 
I used  dol_sanitizeFileName only for $file in order to not clean the two '/' characters needed in the path
 2015-12-27 18:27:18 +01:00
Bahfir Abbes
0027e1a8ba Include local constants files and fetch their values to the corresponding database constants 
Modules may declare their file constants in a file named as : "module name"_consts.php and located in the module root folder.
They may also assign a correspondence between file constants they define and their equivalent database constants in a table named $file2bddconsts defined in their constants file.
To get this two functions the module need to add its name to the list of modules in LOCAL_CONSTS_FILES.
 2015-12-24 20:25:54 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. 
All emails sent from Dolibarr have a dedicated tracking id.
 2015-11-12 21:25:01 +01:00
Laurent Destailleur
71fa347e8e FIX Better compatibility for users that used the not supported option 
MAIN_USE_JQUERY_MULTISELECT set to 1.
 2015-11-08 18:40:12 +01:00
Laurent Destailleur
d71ccc4a02 NEW The free text in PDF footer can now be a HTML content. So the 
WYSIWYG editor is on by default to edit it into module setup.
 2015-10-19 14:39:55 +02:00
Laurent Destailleur
e1b969cb90 FIX Init into bad var 2015-09-26 16:52:58 +02:00
Laurent Destailleur
f0d39a6a92 FIX Init into bad var 2015-09-26 16:51:51 +02:00
GUERRIER Kevin
692fdbaec4 Adding Document tab into Bank Account 2015-09-04 21:29:16 +02:00
Laurent Destailleur
9aa60e1ae1 Fix remove warning 2015-08-31 19:02:14 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples 
Fix #2988
 2015-06-08 17:13:23 +02:00
Laurent Destailleur
a690276060 Fix js warnings, select2 css was not loaded. 2015-04-21 12:08:36 +02:00
Raphaël Doursenaud
e7a21de11d Use minified select2 js lib 2015-04-19 12:58:47 +02:00
Laurent Destailleur
a32fc9efce Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set. 
Avoid logo to overwrap box with css.
Add help text.
 2015-03-24 14:08:56 +01:00
Laurent Destailleur
6db3f1b30e Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL 2015-03-07 19:06:56 +01:00
Laurent Destailleur
73afe1513d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/index.php
 2015-03-02 03:07:19 +01:00
Marcos García de La Fuente
fb959abc63 Misc PHPdoc fixes 2015-02-25 18:24:36 +01:00
Laurent Destailleur
3186a8c23f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 12:07:53 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
5f353c39d1 Fix: PHPCS 2014-12-05 20:18:30 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
5dbfaec9f8 Enable option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS by default 2014-12-04 11:18:40 +01:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
Laurent Destailleur
c18d7de7b0 Fix: Use bad var for test 2014-06-22 13:33:31 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
5a9cca62a6 Clean code 2014-05-04 17:38:26 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
a574aeff96 Qual: Removed warning 2014-04-30 15:30:20 +02:00
Laurent Destailleur
4ade14b841 Qual: Removed code we should not have. 2014-04-26 16:15:35 +02:00
Raphaël Doursenaud
3eabffbc7c Qual: Missing global declaration 2014-04-23 18:23:55 +02:00
Laurent Destailleur
4be113b2e8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-10 17:55:14 +02:00
Laurent Destailleur
30731e6c91 Fix: Must use $this 2014-04-10 17:51:42 +02:00
Laurent Destailleur
b586b74c79 Fix: Try/catch 2014-04-09 17:07:27 +02:00
Laurent Destailleur
76259a633c Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have 
to do it everywhere at different places. Value is now 0 or 1.
 2014-03-31 02:16:49 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
4bd6f11112 Backport fix to solve warning problems. 2014-03-21 18:35:50 +01:00
Laurent Destailleur
24dbfbba60 Qual: Still working on cleaning code for timezone management. 2014-03-21 18:05:08 +01:00
philippe
6f129c3800 display adherent module for external user 2014-02-13 16:36:34 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
4d298b1891 Update code comments and add log warning to help debug 2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961 Update code comments and add log warning to help debug 2014-01-12 20:02:41 +01:00
Laurent Destailleur
4d379e572a Fix: Bugs into permissions for module category 2014-01-07 15:35:26 +01:00
Laurent Destailleur
89c772459f Fix: Bugs into permissions for module category 2014-01-07 14:55:03 +01:00
Laurent Destailleur
6a1446f4dd Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 16:35:02 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +02:00
Laurent Destailleur
4876aee493 Fix: Fix bad fix of SOCIETE_CODEFOURNISSEUR_ADDON 2013-04-11 20:32:09 +02:00
Regis Houssin
662d9cfa6e Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:11:15 +02:00
Regis Houssin
9b2cbfef05 Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:10:11 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme. 
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
 2013-04-03 15:20:56 +02:00
Laurent Destailleur
50de5a944a Fix: compatibility with new menu manager 2013-02-24 03:29:03 +01:00
Laurent Destailleur
a8ccc0ab0b Fix: loghandler loaded twice. 2013-01-28 12:36:15 +01:00
Laurent Destailleur
db38c9baac Fix: loghandler loaded twice 2013-01-28 12:35:29 +01:00
Laurent Destailleur
b98151db94 Fix: A log handler can be loaded twice. 2013-01-28 12:22:12 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
6091f74b13 New: First changes to simplify/optimize menu management. 2013-01-17 18:39:15 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
49313fff3b Fix: External user should not see boxes of modules not allowed to 
external users.
 2013-01-14 13:06:08 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
Laurent Destailleur
9b3874f6f9 Fix: PHPUnit found regression 2013-01-08 12:26:02 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
ba4be70a5e Fix: External user was not using correct menu handler. 2012-12-27 17:06:55 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
af637c8afb Qual: Removed "dolibarr" into default email sender. 2012-11-21 14:45:02 +01:00
Regis Houssin
5faa7fb075 Fix: for module name with number 2012-11-12 19:09:53 +01:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Regis Houssin
3823e5d374 New: add possibility to add or force default directories 2012-09-05 17:37:58 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
Regis Houssin
7e5971f2d1 Fix: missing conf max_file_size 2012-09-02 22:15:18 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Laurent Destailleur
0d346ac1c1 New: A module can add several css and several js. 
New: Removed lightbox as it is not compatible with GPL.
 2012-08-08 20:43:23 +02:00
Regis Houssin
5ad211a1ca Fix: bad document path with multicompany 2012-08-01 19:34:42 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
ba45953223 Fix: more bugs with multicompany 2012-07-07 11:01:05 +02:00
Regis Houssin
ca62c3dba8 Fix: compatibility with multicompany 2012-07-06 20:50:24 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
315fba37fc Fix: restore broken feature (hooks) 2012-06-13 09:28:48 +02:00
Laurent Destailleur
a23df4f407 Qual: Removed deprecated var 
New: Can add global js
 2012-06-12 18:35:29 +02:00
Regis Houssin
18c081a7ac New: add external theme with a module 2012-04-30 16:51:45 +02:00
Laurent Destailleur
ff06360071 Fix: Overwritting code is not role of a template but of a module. 
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
 2012-04-28 17:01:25 +02:00
Laurent Destailleur
220d7a2c33 Fix: eldy theme still works without css3 2012-04-17 10:27:42 +02:00
Laurent Destailleur
c876b6f2be Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:20:10 +02:00
Laurent Destailleur
bc8d9d9d87 Fix: Removed warning 2012-04-10 12:38:10 +02:00
Regis Houssin
921c8607d7 Fix: multicompany sharings and uniformize code 2012-04-07 10:19:33 +02:00
Regis Houssin
98f7a189d1 Fix: add backward compatibility 2012-04-06 23:26:04 +02:00
Regis Houssin
94788e2ccb Fix: compatibility with multicompany sharings 
use new $conf->product->dir_output[$object->entity] instead
$conf->product->dir_output
 2012-04-06 22:41:33 +02:00
Regis Houssin
c57063878d New: add workflow module part for external modules 2012-04-04 09:29:05 +02:00
Regis Houssin
3c794967c3 Fix: multiple avoid warning with php strict mode 2012-03-23 17:18:33 +01:00
Regis Houssin
5d2da2c884 Fix: uniformize code 2012-03-22 08:33:44 +01:00
Regis Houssin
95aa484e44 Fix: move in constructor 2012-03-21 08:53:49 +01:00
Regis Houssin
52a8216e3e Fix: avoid php E_STRICT errors and compatibility with php 5.4 2012-03-21 02:12:44 +01:00
Regis Houssin
e02fe135db Fix: instantiate $mc object at the end 2012-03-20 15:28:21 +01:00
Regis Houssin
ea65c45b2c Fix: backward compatibility 2012-03-20 15:14:37 +01:00
Regis Houssin
4ecc64504d Fix: use the original json functions 2012-03-18 19:59:38 +01:00
Regis Houssin
9b7afbc29b Works on alternative addresses management 2012-03-14 18:03:36 +01:00
Laurent Destailleur
bcff85108e Fix: substitutions modules were not executed. 2012-03-09 10:52:54 +01:00
Laurent Destailleur
6d8c1bf7c6 Fix: Removed warnings 2012-03-03 16:44:05 +01:00
Regis Houssin
034b0fc4d4 New: add dol_json_encode and dol_json_decode instead 
serialize/unserialize
 2012-03-02 17:48:05 +01:00
Regis Houssin
6aa7e90834 Fix: merge problem 2012-03-01 08:03:27 +01:00
Regis Houssin
f3cb926c3c Fix: use generic array for all parts 2012-03-01 13:58:33 +08:00
Laurent Destailleur
7c4e908639 models_modules isn't enough so we use same facture_invoice, 
commande_invoice, propale_invoice. This means module descriptor file
should contains
module_parts('facture'=>1) if we want to add doc template for invoice
into module/core/modules/facture/doc
 2012-03-01 02:06:08 +01:00
Laurent Destailleur
badc6d0f45 Fix: Fix tons of bugs after change for new way to declare modules 
features
 2012-03-01 00:03:16 +01:00
Laurent Destailleur
e0f7637bb3 Fix: Restore barcode management 2012-02-29 22:54:34 +01:00
Regis Houssin
0b945f0716 Fix: use dol_buildpath 2012-03-01 04:10:50 +08:00
Regis Houssin
45ff7bddb3 New: Check if there is external models to do asked by plugins 2012-03-01 00:29:56 +08:00
Regis Houssin
f4bab2f6de Fix: avoid warning and deprecated variable 2012-02-27 08:47:25 +01:00
Regis Houssin
1b236c5c56 Fix: possibility to add more parameters (eg: entity=0) 2012-02-24 15:53:38 +08:00
Regis Houssin
d7f92041c2 Fix: define an array by default if not exist 2012-02-24 14:00:43 +08:00
Regis Houssin
a68ac56e5b Fix: remove obsolete code 2012-02-23 22:01:55 +01:00
Regis Houssin
ee80305e6c Fix: full path is defined by default 2012-02-23 20:03:07 +01:00
Regis Houssin
3770b7ffcc Fix: remove obsolete code 2012-02-23 19:42:57 +01:00
Regis Houssin
4b4b5be6f5 Fix: bad test 2012-02-23 19:35:13 +01:00
Regis Houssin
e257d7d6d4 New: possibility to defined hooks in array format with parts module 
system
 2012-02-23 17:34:17 +01:00
Regis Houssin
2dabf0e185 Fix: possibility to defined a specific path 2012-02-23 16:20:15 +01:00
Regis Houssin
46ad02cbc8 New: add generic function for module parts 2012-02-23 15:42:03 +01:00
Regis Houssin
a444fc955d New: add generic function for module parts 2012-02-23 14:28:50 +01:00
FHenry
21ffd56795 Correct Bug of CSS in conf 2012-02-23 11:27:13 +01:00
Laurent Destailleur
2647cb72ac New: Now all features can be provided by a module with all files inside 
the directory of module.
 2012-02-22 16:18:03 +01:00
Regis Houssin
0cff48f9b3 Fix: merge conflict 2012-02-21 10:47:08 +01:00
Regis Houssin
e5c0a99584 Fix: for multi-company 
Conflicts:

	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2012-02-21 10:26:38 +01:00
Laurent Destailleur
e903719c36 Qual: Uniformize code 
Perf: Very small per enhancement
 2012-02-19 17:12:17 +01:00
Laurent Destailleur
acef131833 New: Uniformize code to manage menus handler provided by external 
modules
 2012-02-12 15:17:54 +01:00