Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,188 Commits 36 Branches 189 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

2793 Commits

Author SHA1 Message Date
aspangaro
33e8833287 Fix travis 2016-04-03 10:47:21 +02:00
Laurent Destailleur
10f639507f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2 FIX image extension must be in lower case 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:46:01 +02:00
Laurent Destailleur
c12541f4f2 FIX image extension must be in lower case 2016-04-02 15:00:58 +02:00
Laurent Destailleur
c0b2d7405a FIX Generated thumbs must always use the png format so using thumbs can 
work.
 2016-04-02 14:46:04 +02:00
Laurent Destailleur
599b225489 FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:21:50 +02:00
Laurent Destailleur
be8384389f FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:20:21 +02:00
Laurent Destailleur
66f9f0d046 FIX Creation of thumb image for size "small" was not done. 2016-04-02 14:15:38 +02:00
Laurent Destailleur
281b06a2d3 NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and 
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
 2016-04-01 18:44:23 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b Start implement advance arget emalaing 2016-04-01 10:52:19 +02:00
Laurent Destailleur
2e5cc98e59 Fix into badges visibility 2016-03-29 20:06:01 +02:00
Laurent Destailleur
30aea901b8 Merge pull request #4855 from marcosgdf/account-oop 
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
 2016-03-25 17:41:39 +01:00
Laurent Destailleur
c8fd12cdaa Update code comment 2016-03-25 17:14:20 +01:00
Laurent Destailleur
61bc8fc9ef NEW Can edit value date of a vat payment after recording it. 
Conflicts:
	htdocs/compta/localtax/card.php
	htdocs/core/class/html.form.class.php
 2016-03-25 16:01:45 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01: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
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Laurent Destailleur
4ec41bc33b NEW Can edit value date of a vat payment after recording it. 2016-03-25 14:49:48 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Juanjo Menent
c323948669 Merge pull request #4856 from marcosgdf/pdf-phpdoc-fix 
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
 2016-03-21 20:40:07 +01:00
Juanjo Menent
187a04854f Merge pull request #4862 from marcosgdf/form-selectarray2 
Corrected non-static usages of several Form functions
 2016-03-21 20:21:29 +01:00
Laurent Destailleur
d4f5076a84 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-20 17:37:50 +01:00
Laurent Destailleur
706a7f05b8 FIX PHPCS 2016-03-20 17:37:27 +01:00
Laurent Destailleur
6b821f15d1 FIX Bad vat definition when using POS module 2016-03-20 17:36:13 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +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
Marcos García de La Fuente
889c72611d NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown 2016-03-19 23:00:33 +01:00
Laurent Destailleur
8689240b7f Merge remote-tracking branch 'origin/3.9' into develop 2016-03-19 21:37:08 +01:00
Laurent Destailleur
af3256f84a Fix first change to fix serious pb with vat definition when using the 
POS.
 2016-03-19 21:35:03 +01:00
Marcos García de La Fuente
7fbf16a202 Fixed an error including FormBank class 2016-03-19 20:51:43 +01:00
Marcos García de La Fuente
8ef122ad99 Fixed missing require bug 2016-03-19 20:12:41 +01:00
Marcos García de La Fuente
39d17c0132 Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters 2016-03-19 20:05:13 +01:00
Marcos García de La Fuente
1be9c53b6c NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country 2016-03-19 19:39:18 +01:00
Laurent Destailleur
5eef373ed6 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/user/card.php
 2016-03-18 14:56:44 +01:00
Laurent Destailleur
97b630ac65 NEW Can use ^ and $ (to say start with or end with like regex syntax) 
into search fields when search field is text. Bonus: ^$ can filter all
lines with field not defined.
 2016-03-18 12:42:13 +01:00
Laurent Destailleur
5edeeae384 FIX Bad error and style message when changing its own login 2016-03-18 11:30:15 +01:00
Laurent Destailleur
a5571b1040 NEW Show a badge with number of withdraw requests done on the withdraw 
tab of invoice.
 2016-03-13 01:20:54 +01:00
Laurent Destailleur
7dac7c4f04 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-11 11:00:53 +01:00
Laurent Destailleur
a9058df753 Fix bad field in select 2016-03-11 10:47:17 +01:00
Laurent Destailleur
7a5353efb2 Make things clearer about option MAIN_ENABLE_LOG_TO_HTML 2016-03-10 18:36:09 +01:00
Laurent Destailleur
155fd71f6d Merge pull request #4734 from fappels/develop 
Fix: add require to showDimensionInBestUnit
 2016-03-10 13:22:58 +01:00
Laurent Destailleur
d0441fa05f NEW: Show into badge on tab head the number of dedicated contacts for 
objects.
 2016-03-10 11:16:12 +01:00
Laurent Destailleur
8ab343e95f Can choose number of decimals into function showDimensionInBestUnit 2016-03-09 23:17:46 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Francis Appels
0890f20a72 Update functions.lib.php 
Add product.lib for function measuring_units_string
 2016-03-04 19:29:08 +01:00
Laurent Destailleur
87093c79f9 Merge pull request #4708 from marcosgdf/account-constants 
Started using Account TYPE and STATUS constants
 2016-03-04 16:23:50 +01:00
Laurent Destailleur
e92318bc13 Better fix to manage several level of beta and rc 2016-03-04 15:21:26 +01:00