lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,023 Commits 43 Branches 150 Tags 886 MiB
cc5dcde9e1
Commit Graph

3950 Commits

Author SHA1 Message Date
Laurent Destailleur
3db52b5f9e Debug responsive of v7 2017-11-24 14:23:25 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Laurent Destailleur
b0cecab22b Removed useless code 2017-11-22 21:26:24 +01:00
Laurent Destailleur
240f67d82b Disable tab if not on develop mode 2017-11-22 21:23:42 +01:00
Laurent Destailleur
5fa8db1650 Work on timesheets 2017-11-22 21:19:40 +01:00
Laurent Destailleur
c3d8ef2104
Update functions.lib.php 2017-11-22 11:14:52 +01:00
Regis Houssin
a9bfe0f48f Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876) 2017-11-22 10:12:51 +01:00
Regis Houssin
848a27283b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member 2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148 NEW add possibility to remove address field 2017-11-22 09:51:46 +01:00
Laurent Destailleur
4b4412d5da Standardize file names for ECM 2017-11-20 19:40:34 +01:00
Laurent Destailleur
e19ca7b6d4 Work on generic filemanager 2017-11-20 18:19:41 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
Laurent Destailleur
80bdb45be8 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:29:42 +01:00
Laurent Destailleur
2cb190fc5c Fix return code 2017-11-17 15:27:59 +01:00
Laurent Destailleur
ead629708c Look and feel v6 2017-11-17 14:57:14 +01:00
Laurent Destailleur
405275693f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenishorders.php
	htdocs/projet/activity/perday.php
 2017-11-17 14:20:08 +01:00
Laurent Destailleur
68f477eaf7
Merge pull request #7818 from dolibarr95/patch-29 
Fix : syntax error in dol_print_graph()
 2017-11-17 13:18:11 +01:00
Laurent Destailleur
e06087888b NEW Show line "other filtered task" when using filter on timesheet. 2017-11-16 22:55:04 +01:00
Laurent Destailleur
f153d9c9ff Fix time spent counted twice 2017-11-16 19:41:31 +01:00
Laurent Destailleur
4f25bc5e3b NEW detection of edge browser 2017-11-16 14:44:55 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
dolibarr95
c6c1552c01
syntax error 
bad syntax when add an url in dol_print_graph()
 2017-11-15 11:11:45 +01:00
Laurent Destailleur
451d3ed8ed NEW Add API to activate/unactivate a contract 2017-11-14 17:51:04 +01:00
florian HENRY
e195cf0b95 fix : return vat code for supplier price 2017-11-14 09:53:06 +01:00
Laurent Destailleur
97c9549087 Fix ref supplier must be output if it exists, even for free products 2017-11-13 11:30:41 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
Laurent Destailleur
356525730d FIX #7786 2017-11-12 20:12:56 +01:00
Laurent Destailleur
955ed7dbbf NEW Show the supplier ref into supplier cards 2017-11-12 15:30:21 +01:00
Laurent Destailleur
186c8cdbf0 Fix selection of contact into creation of event 2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf 
NEW generate also document when invoice is build from recurring template
 2017-11-11 17:42:26 +01:00
Laurent Destailleur
cb6bf91044
Merge pull request #7787 from libersoft/feature/correct-italian-address-format 
NEW Support Italian addresses format. Fixes #7785
 2017-11-11 17:38:29 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd CSS 2017-11-10 20:20:59 +01:00
Laurent Destailleur
c2d7b88bdd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54 Work on filemanager generic component 2017-11-10 13:45:38 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs 2017-11-09 23:39:28 +01:00
Laurent Destailleur
9b07f33649 Clear code 2017-11-09 09:50:55 +01:00
Laurent Destailleur
d18f65a6e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-11-09 01:25:41 +01:00
Laurent Destailleur
ad71a22994 Code comment 2017-11-09 01:21:02 +01:00
Laurent Destailleur
c8a551e7de Reorganize javascript at end of page. 2017-11-09 01:00:43 +01:00
Valerio Baldisserotto
15a501467e FR: Support Italian address format. Fixes #7785 2017-11-08 11:43:52 +01:00
Laurent Destailleur
e7abc92f97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/transfer.php
	htdocs/core/lib/functions.lib.php
 2017-11-06 21:37:19 +01:00
Laurent Destailleur
bc093ef969 FIX #7775 Order of deletion in delete method (trigger first) 2017-11-06 19:27:10 +01:00
Laurent Destailleur
bc9b816719 Fix deletion of files that contains __ 2017-11-06 17:54:18 +01:00
Laurent Destailleur
864af9cc3b Fix error not returned if output directory not writable 2017-11-06 11:47:03 +01:00
Laurent Destailleur
ea5dd3eb3d NEW Add REST API for supplier proposals 2017-11-06 11:06:31 +01:00
Laurent Destailleur
534c50f46e Move api that are admin features into a dedicated /admin api 2017-11-06 09:55:31 +01:00
Laurent Destailleur
7139cbb490 Fix regression 2017-11-05 19:00:43 +01:00
Laurent Destailleur
fd8f65341b
Merge pull request #7765 from bomuux/patch-3 
Fix: vat reports now include expense reports vat
 2017-11-05 18:37:25 +01:00
Laurent Destailleur
1e939ec90c
Merge pull request #7761 from hregis/develop_member 
Fix: broken feature (add more attr and css class)
 2017-11-05 18:33:43 +01:00
Laurent Destailleur
202d36d582 Work on modulebuilder 2017-11-05 18:15:59 +01:00
Laurent Destailleur
e4ba6cfa10 Debu website module 2017-11-05 03:57:26 +01:00
Laurent Destailleur
c78c06776b Fix bug reported by scrutinizer 2017-11-05 03:39:27 +01:00
Laurent Destailleur
91950ccbc7 Fix regression in getRandomPassword 2017-11-05 03:03:17 +01:00
Laurent Destailleur
05ee3e3825 Fix show message "files uploaded" only once even when n files. 2017-11-05 01:06:34 +01:00
Laurent Destailleur
bac6a434f4 Add link to make a direct download on card 2017-11-04 17:11:58 +01:00
bomuux
0a2d8a820b
FIX: make vat reports work with expensereports 
function tax_by_date : Fixed sql query for expense reports vat, now returning pad vat for expense report, previously returning nothing.
 2017-11-03 21:06:56 +01:00
Laurent Destailleur
e78406e120 Debug cronjob 2017-11-03 20:04:18 +01:00
Laurent Destailleur
f32f3ff17f Better default function to generate passwords 2017-11-03 18:02:17 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Regis Houssin
2d4717b745 Fix: broken feature (add more attr and css class) 2017-11-03 14:46:45 +01:00
Laurent Destailleur
fa1fbe7db7 Work on websiteaccounts 2017-11-03 13:25:49 +01:00
Laurent Destailleur
ce3e586bd0 Fix doxygen 2017-11-03 11:44:31 +01:00
Laurent Destailleur
2a2c0aaa5f Clean and debug code to execute CLI commands 2017-11-02 20:17:27 +01:00
Laurent Destailleur
f5e1ca3178 Fix break on project 2017-11-02 15:33:04 +01:00
Laurent Destailleur
cfacfab6cf NEW Show badge with nbr of shipment on shimpen tab of order 
NEW Add button cancel on shipment creation
 2017-11-02 12:38:36 +01:00
Laurent Destailleur
dbd85321b3
Merge pull request #7735 from grandoc/new_branc_30_10_17 
Warning: trim() expects parameter 1 to be string, array given in /htt…
 2017-11-02 09:58:57 +01:00
Laurent Destailleur
6ea558b639
Update functions.lib.php 2017-11-02 09:58:22 +01:00
Laurent Destailleur
f26d970d58 Remove option MAIN_HTML5_PLACEHOLDER (on by default now) 2017-11-01 10:17:24 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Laurent Destailleur
d39a19e976 Replace on/off img tick with fa-font 2017-10-31 12:32:30 +01:00
Laurent Destailleur
bd94ec0f1d Use fontawesome for picto for on/off default. 2017-10-31 12:25:06 +01:00
Laurent Destailleur
068f5e32cb NEW Tooltip for substitutions variables on tooltips on admin pages 2017-10-31 11:17:44 +01:00
Laurent Destailleur
b29f32171c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/filefunc.inc.php
 2017-10-30 18:22:26 +01:00
Philippe GRAND
f904c46a10 Warning: trim() expects parameter 1 to be string, array given in /httpdocs/core/lib/functions.lib.php on line 520 2017-10-30 14:22:34 +01:00
Laurent Destailleur
33aa0f3160 Code comment 2017-10-29 17:49:24 +01:00
Laurent Destailleur
cd5e43483e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/expedition/card.php
	htdocs/projet/class/task.class.php
 2017-10-28 22:08:16 +02:00
Laurent Destailleur
adc4db0f85 Standardize code 2017-10-28 16:55:25 +02:00
Laurent Destailleur
9676b83574 Google tag enabled also on mobile 2017-10-28 16:00:46 +02:00
Laurent Destailleur
9e382a7f1b Can disabled output of notify messages 2017-10-28 13:36:23 +02:00
Laurent Destailleur
9a5d532786 Fix website 2017-10-27 18:45:12 +02:00
Laurent Destailleur
013ab9405e Work on website module 2017-10-27 17:58:38 +02:00
Laurent Destailleur
01af1e3252 Work on website module 2017-10-27 15:42:48 +02:00
Laurent Destailleur
f02e731c67 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/lib/project.lib.php
 2017-10-27 02:32:09 +02:00
Laurent Destailleur
fed0f3d09e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/class/task.class.php
 2017-10-27 02:30:33 +02:00
Laurent Destailleur
90bd9f2f4f Fix trad 2017-10-26 20:57:23 +02:00
Laurent Destailleur
a1f862eba6 NEW Enhance framework so we can use html/icons into SELECT options. 2017-10-26 20:06:23 +02:00
Laurent Destailleur
67e5d72bd0 Fix doxygen 2017-10-26 14:56:07 +02:00
Laurent Destailleur
82b333e423 Fix migration to select2 4.0.5 2017-10-26 14:06:23 +02:00
Laurent Destailleur
5f5cbec1cf Debug module website 2017-10-26 13:09:11 +02:00
Laurent Destailleur
6d6c4bf088 Fix export web site 2017-10-26 10:43:47 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
f381361c8b Work on modulebuilder 2017-10-24 19:57:36 +02:00
Laurent Destailleur
53d2f29cdd Fix regression 2017-10-23 10:27:50 +02:00
Laurent Destailleur
f4f47c6732 NEW Remove tooltip tipTip library replaced with standatd jquery tooltip 2017-10-22 21:15:08 +02:00
Laurent Destailleur
efb369f857 Merge pull request #7497 from atm-florian/dev_accountancy 
NEW : lettrage in accountancy
 2017-10-22 15:28:53 +02:00
Laurent Destailleur
b9bbba813a Update company.lib.php 2017-10-22 15:28:03 +02:00
Laurent Destailleur
fb843430bf FIX #7671 2017-10-22 03:22:31 +02:00
Laurent Destailleur
dbcf3ddbe8 NEW Upgrade jquery select2 to 4.0.4 2017-10-21 19:05:24 +02:00
Laurent Destailleur
1426737a26 Work on website 2017-10-21 12:26:14 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d More modern picto for switch on/off 
Work on website module
 2017-10-20 21:39:19 +02:00
Laurent Destailleur
ab4f5a3aea Clean code 2017-10-20 18:15:43 +02:00
Laurent Destailleur
985675d680 Clean code 2017-10-20 18:04:46 +02:00
Laurent Destailleur
d82af57b57 NEW Add tab "Expense report" on user card 2017-10-19 20:56:23 +02:00
Laurent Destailleur
abd5251330 Better responsive 2017-10-19 19:53:29 +02:00
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc. 
Work on option PROPOSAL_USE_ONLINE_SIGN
 2017-10-19 11:40:40 +02:00
gauthier
3793ae323a FIX : wrong personnal project time spent 2017-10-19 09:46:19 +02:00
florian HENRY
63f3ac2f2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_accountancy 2017-10-18 14:49:06 +02:00
Laurent Destailleur
69b131b919 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/api_thirdparties.class.php
 2017-10-18 11:28:20 +02:00
florian HENRY
4273e507c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 
dev_accountancy

Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
	htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2017-10-18 09:52:56 +02:00
Laurent Destailleur
aa1ff189e1 Fix var not correctly initialized when using api + multicompany 2017-10-17 12:58:26 +02:00
Laurent Destailleur
41464bf5ac Merge pull request #7633 from defrance/patch-101 
template file not only odt/ods
 2017-10-16 20:25:20 +02:00
Laurent Destailleur
87814af7b6 Move function colorIsLight into functions.lib.php 
Fix scrutinizer bugs.
 2017-10-16 09:29:10 +02:00
Laurent Destailleur
afdc176f47 Fix scrutinizer 2017-10-16 08:52:00 +02:00
BENKE Charlene
c44207f7d3 template file not only odt/ods 2017-10-14 12:39:39 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
8113321062 Start to work on email sender profiles 2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
Laurent Destailleur
6497ca5394 prepare tzuserrel 2017-10-12 18:14:02 +02:00
Laurent Destailleur
50da6a0c9e Prepare code for removing adodb 2017-10-12 14:59:38 +02:00
Laurent Destailleur
3f36cf23f5 NEW Break lines per project on the new timesheet page 2017-10-12 13:17:22 +02:00
Laurent Destailleur
cf3dd4be12 Merge pull request #7606 from dolibarr95/patch-23 
NEW More picto for phone
 2017-10-11 11:51:07 +02:00
Laurent Destailleur
eb75c2f98e Merge pull request #7596 from hregis/develop_bug2 
Fix: wrong POST GET name
 2017-10-11 11:30:36 +02:00
dolibarr95
572a64bdbf display mobile picto 
runs with #6617
 2017-10-10 10:19:04 +02:00
Laurent Destailleur
9427655dd0 Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default 2017-10-09 18:18:34 +02:00
Laurent Destailleur
084dc7798d Standardize use of function getCommonSubstitutionArray 2017-10-09 14:51:42 +02:00
Regis Houssin
64d9b625ff Fix: wrong POST GET name 2017-10-09 11:03:16 +02:00
Laurent Destailleur
245c048b40 Merge pull request #7577 from OPEN-DSI/fix_0001 
Fix carriage return when get full address formated for output on documents
 2017-10-09 10:48:26 +02:00
Laurent Destailleur
3e0ccd6312 FIX #7585 2017-10-09 10:43:19 +02:00
KHELIFA
d77dfb9199 Fix return chariot 2017-10-09 09:26:25 +02:00
Laurent Destailleur
67c33840cf Code comment 2017-10-08 23:19:19 +02:00
Laurent Destailleur
33624e1001 NEW Attaching doc automatically in email is now a parameter of template. 2017-10-08 16:34:42 +02:00
Laurent Destailleur
7465daa0da Merge pull request #7583 from hregis/develop_admin 
NEW add '$moreatt' parameter in picto_from_langcode function
 2017-10-07 13:45:16 +02:00
Laurent Destailleur
66978a3bb4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2017-10-07 13:44:27 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
74deb05527 Clean code. Use constant for status of supplier order process. 2017-10-07 13:04:31 +02:00
Laurent Destailleur
4347bc06a2 do no transform data:image 2017-10-07 02:40:03 +02:00
Laurent Destailleur
3cc48f156f The new website module become wonderfull 2017-10-07 02:29:27 +02:00
Laurent Destailleur
aa3fd067fc Fix regex UNGREEDY 2017-10-06 23:54:45 +02:00
Laurent Destailleur
8e187c2759 Debug module website 2017-10-06 22:49:08 +02:00
Regis Houssin
e0e10ff830 NEW add '$moreatt' parameter in picto_from_langcode function 2017-10-06 20:53:41 +02:00
Laurent Destailleur
df38f60617 Export website into zip 2017-10-06 18:29:18 +02:00
Laurent Destailleur
43d85af5ae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 15:23:10 +02:00
KHELIFA
dc87133e0b Fix carriage return when get full address formated for output on documents 2017-10-06 15:06:59 +02:00
Laurent Destailleur
1becbb8805 Fix bad date on time spent view 2017-10-06 14:38:33 +02:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Laurent Destailleur
777486d74c Keep usage of function dol_hash to encrypt a non encrypted data 2017-10-06 13:13:51 +02:00