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

311 Commits

Author SHA1 Message Date
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