lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

865 Commits

Author SHA1 Message Date
Laurent Destailleur
a35dd9f2d1 Fix bad separation of address 2016-08-01 19:37:17 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4 Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
Laurent Destailleur
a6147ee73b Miscellaneous fixes 2016-07-30 14:49:29 +02:00
Laurent Destailleur
d619a641ce Fix regression (empty log were output) 2016-07-28 14:11:41 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Laurent Destailleur
b615b52f47 FIX html detection fails if only u tag is present 2016-07-26 16:11:38 +02:00
All3kcis
f4705873cb Update functions.lib.php 
Remove useless verification on $level. Second check "in_array" line 624 is sufficient with strict mode.
Otherwise "Emerg level" is not possible with "empty($level).. LOG_EMERG = 0...
 2016-07-19 15:27:03 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
9512bf1ac7 Add phpunit tests for option USE_STRICT_CSV_RULES 2016-07-15 12:30:24 +02:00
Laurent Destailleur
9bd937a3bc Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-14 00:35:59 +02:00
Laurent Destailleur
0ad0755f4d Merge remote-tracking branch 'origin/3.9' into develop 2016-07-14 00:35:09 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for 
substitution hooks
 2016-07-13 23:06:41 +02:00
Laurent Destailleur
933ec6c118 FIX detection of HTML content when only p tag is present. 2016-06-29 13:14:53 +02:00
Laurent Destailleur
74f19944b9 Fix rtl language ar_SA 2016-06-20 00:13:30 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
eac5cbb0dd FIX Fix the reposition on the clear target button. 2016-06-19 11:59:55 +02:00
Laurent Destailleur
243a30e5de Code comment 2016-06-17 15:51:09 +02:00
Laurent Destailleur
65cbf1623b Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER 2016-06-12 20:24:05 +02:00
Laurent Destailleur
74e59a1bc4 Debug prototype feature "testmenuhider" 2016-06-10 18:41:10 +02:00
Laurent Destailleur
645412517d css enhancement 2016-06-06 22:07:35 +02:00
Laurent Destailleur
51ce4804dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-06 10:58:43 +02:00
Laurent Destailleur
ff23c825ae Code comment 2016-06-06 10:58:23 +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
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
7866fb9dae Fix #5153 2016-06-04 19:11:32 +02:00
jean
49d0c8d5ff FIX #4173 Ergonomie of product/service card 
Add configuration key PRODUCT_NODISPLAYIFNOPHOTO to avoid displaying
nophoto.png
 2016-06-04 16:34:26 +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
Laurent Destailleur
1bc6c4ffa3 Clean code 2016-05-30 20:50:49 +02:00
Laurent Destailleur
46a0f3dab0 Fix minor bugs 2016-05-30 01:30:28 +02:00
Laurent Destailleur
889ff16906 FIX #5239 2016-05-29 11:56:19 +02:00
Laurent Destailleur
25dfa0c5b9 Work on website 2016-05-07 16:38:32 +02:00
Laurent Destailleur
bfc5be1aad FIX Fix and move dolGetFirstLine function into main 
FIX Hang on ->client not defined
 2016-04-22 19:07:32 +02:00
Laurent Destailleur
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +02:00
Laurent Destailleur
7515b2ba7b NEW Add a parameter on graph function to show a generic graph when no 
data are available.
 2016-04-22 12:11:57 +02:00
Marcos García de La Fuente
54dd1763fe Little refactor 2016-04-17 15:05:54 +02:00
Laurent Destailleur
059466030a FIX Missing a new line into log of sent emails 2016-04-07 12:42:18 +02:00
Laurent Destailleur
2c829e7cb6 NEW Add picto on module list to show warning and if module is an 
external module.
 2016-04-07 11:50:45 +02:00
aspangaro
33e8833287 Fix travis 2016-04-03 10:47:21 +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
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
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
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
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
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
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
7dac7c4f04 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-11 11:00:53 +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
8ab343e95f Can choose number of decimals into function showDimensionInBestUnit 2016-03-09 23:17:46 +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
fd2166ed11 Minor enhancement on new recurring invoice generation 2016-03-03 10:42:49 +01:00
Laurent Destailleur
2ee74a80d9 NEW Enhance navigation of project module 2016-02-28 00:01:50 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Laurent Destailleur
c1ea597cb7 Redesign page with customer price to make it easier to understand. 2016-02-26 13:44:03 +01:00
Laurent Destailleur
e115ac90ec Code comment 2016-02-26 12:08:04 +01:00
Laurent Destailleur
f330a1c8e5 Fix phpcs 2016-02-26 10:55:47 +01:00
Laurent Destailleur
a95240e33d FIX Some troubles into weight and volume calculation when unit differs. 
NEW Introduce a function showDimensionInBestUnit
 2016-02-25 13:46:38 +01:00
Ion Agorria
673f0c70a6 NEW: TimeZone can be supplied to mktime 2016-02-22 22:00:59 +01:00
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
Laurent Destailleur
355f091246 FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE 2016-02-22 13:28:08 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
3b5ce32cb0 Code comment 2016-02-19 01:47:00 +01:00
Laurent Destailleur
5268038e00 Minor css enhancement 2016-02-16 22:58:24 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
aspangaro
47f60e1f8d Add function img_weather 2016-02-13 07:53:50 +01:00
Laurent Destailleur
bc33b19d7d NEW Can change dynamically number of records visible into lists. 2016-02-11 20:24:15 +01:00
Laurent Destailleur
e67be201ed NEW Can select number of lines on page list for projects and tasks 2016-02-11 16:49:13 +01:00
Laurent Destailleur
0d7f67ade5 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-10 23:59:15 +01:00
Laurent Destailleur
6662c1b5e1 NEW Can select dynamicaly number of lines to show on page on product, 
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
 2016-02-10 23:37:34 +01:00
Laurent Destailleur
9b41e11a1e NEW Can select dynamicaly number of lines to show on page 2016-02-10 20:48:18 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +01:00
Laurent Destailleur
7ef0415aca Small per enhancement 2016-02-09 15:57:24 +01:00
Laurent Destailleur
f640bf7c61 Manage the reply-to field into mail libs 2016-02-09 11:56:12 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
928336c835 NEW Clean and enhance code for cron engine 2016-01-31 15:14:50 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
fedf1f3288 Fix view of product image when using old path 
Fix size of image uploaded on user.
 2016-01-22 14:02:48 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
d857b3475b Fix doxygen 2016-01-22 03:07:46 +01:00
Laurent Destailleur
4e87afddf1 Fix: why a floating float here ? 2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82 Fix: why a floating float here ? 2016-01-21 22:43:20 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00
Laurent Destailleur
19bcdb6910 Fix size of cells make page too large even for large screen 2016-01-21 14:56:26 +01:00
bobby
eec22169e3 FIX feature 2015-12-28 10:21:38 +01:00