Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-01 22:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,796 Commits 37 Branches 191 Tags
bba6dc6398fc94c9dad8a7512f235d91c19a5018
Commit Graph

6233 Commits

Author SHA1 Message Date
Laurent Destailleur
2800faffa8 Fix: File names must be in lowercase. 
Fix: Missing includes.
 2014-10-11 18:27:30 +02:00
Laurent Destailleur
cd8936a224 Clean deprecated code. 2014-10-11 15:04:42 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00
Laurent Destailleur
de5005ca54 Fix: Avoid duplicate error message 
Fix: pgsql syntax error
 2014-10-08 15:35:39 +02:00
Laurent Destailleur
4c4485d0ee More comment to explain and remove a todo. 2014-10-08 15:24:35 +02:00
Laurent Destailleur
56f5c666cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 15:09:32 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Regis Houssin
cc553514af Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have 
the same name as the module
 2014-10-08 14:51:16 +02:00
Laurent Destailleur
60f643cf1a Change comented log to help debug 2014-10-05 20:26:35 +02:00
Laurent Destailleur
bb852592e6 Fix: Restore broken feature. One hook = One call of function per module. 2014-10-05 04:49:46 +02:00
Laurent Destailleur
5c5f725a34 Fix scrutinizer 2014-10-05 01:22:17 +02:00
Laurent Destailleur
11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/list.php
 2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
e70aebf2c7 Merge pull request #1937 from fappels/develop 
Expedition lines from same orderline merged.
 2014-10-04 00:58:19 +02:00
Laurent Destailleur
d9f898ab8c Merge pull request #1916 from FHenry/develop 
Add feature to order to invoice on supplier part
 2014-10-04 00:31:11 +02:00
Laurent Destailleur
e7a9447d94 Add hook formatEvent and fix bug into per user view. 2014-10-03 15:58:08 +02:00
Francis Appels
bcc5bebd77 Fix deliveryorder qty and remainingqty positions 2014-10-03 12:28:42 +02:00
Laurent Destailleur
166853dd56 Fix: miscellaneous bugs 2014-10-03 12:15:21 +02:00
Laurent Destailleur
5ac63ec534 Solve fixme. 2014-10-03 02:00:50 +02:00
Laurent Destailleur
7fb2d4d1c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-03 01:48:28 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
Regis Houssin
1541be8790 FIXME $key is not defined (strict mode) 2014-10-02 08:40:51 +02:00
Laurent Destailleur
ec2a8b5551 Merge pull request #1800 from Devensys/Develop-HighlitingIBAN 
Highliting IBAN (sepa)
 2014-09-29 16:43:22 +02:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Regis Houssin
3d82f0965e Fix: Try to filter by context, use the test with $currentcontext in 
method for avoid to run twice (I have not found any other solution!)
 2014-09-29 15:20:54 +02:00
Regis Houssin
334cdf7dca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 14:41:17 +02:00
Regis Houssin
c5a7dfbabb Fix: Add current context for avoid method execution in bad context, you 
can add this test in your method : eg if($currentcontext != 'formfile')
return;
 2014-09-29 14:40:02 +02:00
Laurent Destailleur
e0aa140960 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 14:01:40 +02:00
Laurent Destailleur
8ccb581185 Fix: Change for php 5.6 
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
 2014-09-29 13:21:03 +02:00
Regis Houssin
f1f4fc18e9 Fix: use "doc" instead "pdf" dir and uniformize code 2014-09-29 11:08:50 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
Laurent Destailleur
06494b085a Perf enhancement 2014-09-28 16:38:45 +02:00
Laurent Destailleur
cd4c81d15d Uniformize code. 2014-09-28 16:31:37 +02:00
Laurent Destailleur
2b95bd2fcc Fix: Link to linked object was not working for invoice and order. 
Fix: end date
 2014-09-28 16:12:38 +02:00
Regis Houssin
f527602753 Fix: use specific css style instead, this causes a shift problem 2014-09-28 13:12:51 +02:00
Laurent Destailleur
4244979f4f Fix: doxygen 
Fix: td balance
 2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
8e95f2e223 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-26 12:42:41 +02:00
Laurent Destailleur
bf4b99fa64 Assignation of event to several users is on a very good way for 3.7 2014-09-26 12:27:18 +02:00
Regis Houssin
3ab8b6f7d1 New: add possibility to define a custom error message 2014-09-26 09:44:21 +02:00
Regis Houssin
44cecb8e7d Fix: add possibility to use element id 2014-09-26 09:20:02 +02:00
Regis Houssin
64b757ed81 Fix: add generic doc and use doc dir instead pdf 2014-09-25 12:44:57 +02:00
Florian HENRY
f9fb73ee82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-24 10:04:01 +02:00
Laurent Destailleur
74cba062b4 Add a TODO to explain why we keep some extends into class. 
Should be removed once php min will be 5.4.
 2014-09-23 19:37:59 +02:00
Laurent Destailleur
dd86453020 Add field color into table of type of events 2014-09-23 17:54:03 +02:00
Florian HENRY
518d23f278 Add feature to order to invoice on supplier part 2014-09-23 16:28:29 +02:00