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

3137 Commits

Author SHA1 Message Date
Laurent Destailleur
a79903a2fc Fix responsive design 2017-02-23 01:29:35 +01:00
Laurent Destailleur
bb72121179 Fix menu loading 2017-02-22 01:47:22 +01:00
Laurent Destailleur
32678015c9 FIX protection against infinite loop on hierarchy 2017-02-21 23:52:13 +01:00
Laurent Destailleur
c61c13d9fd Merge pull request #6428 from laudeco/fix/enable_module_with_dependencies 
fix the enabling of a dependency module already ON
 2017-02-17 10:47:29 +01:00
De Coninck Laurent
fd6c4fd4d0 fix the enabling of a dependency module already ON 
If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
 2017-02-16 09:26:18 +01:00
Laurent Destailleur
0e6ba5df4e Merge pull request #6410 from aspangaro/5.0-25 
Fix : Bank account label not shown in dol_banner_tab
 2017-02-12 20:42:38 +01:00
Laurent Destailleur
7e3785d446 FIX the dolCopyDir fails if target dir does not exists. 2017-02-11 15:42:57 +01:00
Alexandre SPANGARO
5c9c761911 Fix : Bank account label not shown in dol_banner_tab 2017-02-09 05:58:39 +01:00
Laurent Destailleur
76280f8ae2 Fix #6365 2017-02-03 11:42:49 +01:00
fappels
8e675fa039 Improve lot qty separation 
Add spaces to lot info separation.
Use implode params according PHP doc.
 2017-01-31 12:54:00 +01:00
Laurent Destailleur
d7c2bdba38 Fix: link was useless with a nofollow tag. 2017-01-29 16:42:59 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
3a2d9c8610 Fix for rtl languages 2017-01-21 16:12:25 +01:00
BENKE Charlie
e6697c32c4 Update images.lib.php 
in fact $dir is not used in the function

Conflicts:
	htdocs/core/lib/images.lib.php
 2017-01-21 12:56:39 +01:00
Laurent Destailleur
ac32161711 Fix error in total of tasks 2017-01-20 14:36:56 +01:00
Laurent Destailleur
9bb9d4d36e Fix position of field and tooltip 2017-01-20 12:08:33 +01:00
Laurent Destailleur
4047de82bd Fix navigation on projects 2017-01-20 10:27:37 +01:00
Laurent Destailleur
3336943ff2 Fix responsive 2017-01-18 15:49:12 +01:00
Laurent Destailleur
bb95f139a8 Fix responsive 2017-01-17 20:04:41 +01:00
Laurent Destailleur
43cb9c30b2 Fix var_dump 2017-01-16 12:21:37 +01:00
Laurent Destailleur
ac80d4057d Fix several running time errors 2017-01-16 09:30:28 +01:00
Laurent Destailleur
a05132d26e Fix PHP 7.1 error 2017-01-16 09:05:09 +01:00
Laurent Destailleur
0fe844aa00 FIX usage of tag {y} in numbering modules 2017-01-16 00:01:06 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
29f07d3e89 The tutorial to add cron is sometimes false. Quick hack for a solution 
to hide it.
 2017-01-13 16:39:35 +01:00
Laurent Destailleur
76a53dfb7d FIX Accept spaces around the | criteria 2017-01-08 01:01:34 +01:00
Laurent Destailleur
2c1477ecea Revert "FIX Accept spaces around the | criteria" 
This reverts commit 37d158f159.
 2017-01-07 21:50:14 +01:00
Laurent Destailleur
37d158f159 FIX Accept spaces around the | criteria 2017-01-07 21:34:12 +01:00
Laurent Destailleur
9cfc8d4095 Fix several problems into OAuth2 module. 2017-01-06 19:58:46 +01:00
Laurent Destailleur
9694a00179 Fix sort is lost on agenda/event of projects 2017-01-02 12:39:12 +01:00
Laurent Destailleur
7dd06a1ae6 Fix margin pagination 2016-12-27 02:01:27 +01:00
Laurent Destailleur
82052450a6 Complete work on dol_banner 2016-12-26 18:21:18 +01:00
Laurent Destailleur
a2133f391f Complete work on dol_banner 2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2 Fix css and fix navigation on resource tab. 2016-12-23 13:04:46 +01:00
aspangaro
098dc08169 Loan : Complete work on dol_banner 2016-12-20 07:29:49 +01:00
Laurent Destailleur
1fdbcf4c0f Fix missing page to match new reorg of agenda events (done for 
thirdparty but not complete for contact)
 2016-12-19 16:22:41 +01:00
Laurent Destailleur
0eded9a8b7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-19 02:36:10 +01:00
Laurent Destailleur
3f5d67d4d6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-19 02:35:16 +01:00
Laurent Destailleur
876722733a Better fix to get localtax 2016-12-19 02:33:54 +01:00
Laurent Destailleur
f762c98a37 Fix html not balanced 2016-12-18 11:27:22 +01:00
Laurent Destailleur
8d9ec4f755 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-18 10:47:45 +01:00
Laurent Destailleur
58a0cb5838 Fix css style 2016-12-18 10:47:24 +01:00
Laurent Destailleur
9fd48df839 Fix minor bug on subscription pages 2016-12-17 19:21:48 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Laurent Destailleur
8f3ce46c50 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f Better fix to add server name into email id. 2016-12-15 12:11:39 +01:00
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-14 12:21:33 +01:00
Laurent Destailleur
56b3f2c011 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:36:11 +01:00
Laurent Destailleur
530d3503f5 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:32:31 +01:00
Laurent Destailleur
871c69ad08 Merge branch 'fix_banks_trans_missing' of 
https://github.com/tarrsalah/dolibarr into
tarrsalah-fix_banks_trans_missing

Conflicts:
	htdocs/core/lib/company.lib.php
 2016-12-11 13:21:21 +01:00
tarrsalah
0547c91d75 Fix #6142 
load "banks" translation when constructing societe tab head in
`societe_prepare_head`.
 2016-12-11 13:10:05 +01:00
BENKE Charlie
b645a50742 Add translation tabs 2016-12-10 23:49:09 +01:00
Laurent Destailleur
0f2963d05b Merge pull request #6123 from atm-maxime/mko_multicurrency_debug 
Fix multicurrency - Part 1
 2016-12-10 23:16:14 +01:00
aspangaro
31fcf9aff9 Fix warehouse presentation 2016-12-10 22:13:06 +01:00
Maxime Kohlhaas
9f045eb996 Missing comments 2016-12-10 22:07:05 +01:00
Maxime Kohlhaas
1f48e0486f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-10 21:50:31 +01:00
Laurent Destailleur
2dda1d7c74 Merge pull request #6116 from simnandez/develop 
Fix: fails to load image to redim into photo resize
 2016-12-10 20:00:52 +01:00
Laurent Destailleur
653eb4d907 Fix project into dol_banner 2016-12-10 20:00:07 +01:00
Maxime Kohlhaas
6474591e25 Allow to enter price in currency 2016-12-10 19:54:16 +01:00
Juanjo Menent
99542de935 Fix: fails to load image to redim into photo resize 2016-12-10 14:47:18 +01:00
florian HENRY
a422819277 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng 2016-12-10 11:49:52 +01:00
florian HENRY
2d2959ffba Set hidden option back 2016-12-10 11:49:35 +01:00
Laurent Destailleur
bd1d076753 Merge pull request #6096 from aspangaro/5.0-b2 
VAT payment card - Uniformize presentation
 2016-12-10 11:44:38 +01:00
Laurent Destailleur
4bb778c54f Merge pull request #6095 from aspangaro/5.0-b1 
Fix presentation on Loan / Expense report / VAT
 2016-12-10 11:42:08 +01:00
florian HENRY
3b25bf2ee6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng 2016-12-10 11:37:07 +01:00
florian HENRY
a0e8b509db Finish Advance target emailing feature (back from hashes since 3.7) 2016-12-09 19:06:59 +01:00
Laurent Destailleur
10c00d37b5 Complete use of dol_banner 2016-12-09 15:59:31 +01:00
Laurent Destailleur
fb45c72cc3 Complete use of dol_banner 2016-12-09 15:03:57 +01:00
aspangaro
b1c007aa75 VAT payment card - Uniformize presentation 2016-12-09 06:59:24 +01:00
aspangaro
302109b3fe Loan - Move tab Notes after Files tab 2016-12-08 22:32:10 +01:00
Laurent Destailleur
6b5ce5c699 Merge pull request #6084 from milamberspace/Fix_ICE_Maroc 
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files …
 2016-12-07 12:00:03 +01:00
Laurent Destailleur
ea3e2e4a95 Merge pull request #6082 from bgenere/develop 
Fixed 2 issues for custom module development regarding import and dictionnaries list.
 2016-12-07 11:34:15 +01:00
Laurent Destailleur
1a842d8366 Fix translation 2016-12-05 13:45:57 +01:00
Milamber
e4006602f3 Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc) 
Fix issue in pdf.lib.php to add the Prof ID 5 and 6

Ref: http://www.ice.gov.ma/ICE/
 2016-12-05 08:04:34 +00:00
Laurent Destailleur
4b831537e5 Fix several problem in notes management of template invoices. 2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
bgenere
1b23f66299 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-02 18:00:34 +01:00
Laurent Destailleur
317df1cf91 Complete work on use of the new ol_banner_tab. 2016-11-30 20:24:36 +01:00
bgenere
9c62adb811 removed a vardump that was used for debug. 2016-11-30 17:46:53 +01:00
bgenere
751651c4d4 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-30 08:37:57 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
bgenere
2e45a8e8b3 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-29 17:15:00 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
bgenere
093942bcd7 Fixed display issue for custom modules dictionnary not displayed 
properly when blank exists in dictionnary list for core modules.
 2016-11-28 15:37:24 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
5acd09b2d5 Fix require_once instead of require. 2016-11-24 17:03:18 +01:00
Laurent Destailleur
b035b1e196 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:48:24 +01:00
Laurent Destailleur
e3c529d483 FIX javascript error when using on mobile/smartphone 2016-11-20 15:38:48 +01:00
Laurent Destailleur
e6894eda0e Better responsive 2016-11-20 10:58:28 +01:00
Laurent Destailleur
7ac96da0d4 Several fix in warehouse stock change (rounding, api rest) 2016-11-18 16:34:03 +01:00
Laurent Destailleur
0b3765dd9a Fix phpcs 2016-11-18 13:17:24 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
4768017662 Debug of module accountancy 2016-11-16 19:23:32 +01:00
Laurent Destailleur
2961039b98 Code comment 2016-11-15 13:14:26 +01:00
Laurent Destailleur
62e0d4ec3f FIX Several problems into shipment management with lot enabled 2016-11-14 14:34:15 +01:00
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
cc70b51ba3 Fix missing warning 2016-11-14 02:25:59 +01:00
Laurent Destailleur
a369514e46 Tooltip help better 2016-11-13 20:43:34 +01:00
Laurent Destailleur
6014345fb7 Fix typo error 2016-11-13 18:28:06 +01:00
Laurent Destailleur
4bcc7dc8a0 CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu 2016-11-12 14:36:52 +01:00
aspangaro
e13e66ce7b Update works 2016-11-12 07:40:08 +01:00
aspangaro
137561aec9 Merge remote-tracking branch 'Upstream/develop' into 5.0-p35 2016-11-12 06:31:06 +01:00
Laurent Destailleur
b1bd9e4930 Responsive design 2016-11-11 23:17:37 +01:00
Laurent Destailleur
7ccc70e00d Fix as suggested for #5960 2016-11-11 15:29:48 +01:00
Laurent Destailleur
071ba4fbfd Fix as suggested for #5960 2016-11-11 15:27:29 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
 2016-11-11 15:12:30 +01:00
Laurent Destailleur
a605e0b972 Fix phpcs 2016-11-11 15:06:31 +01:00
Laurent Destailleur
fd1c0f404c Merge pull request #5864 from hregis/4.0_bug 
Fix: add possibility to change width type to prevent some display issues
 2016-11-11 14:55:28 +01:00
Laurent Destailleur
9606f67bdb Better responsive design 2016-11-10 14:57:50 +01:00
Laurent Destailleur
cc64994f30 Better responsive design 2016-11-10 11:33:25 +01:00
Laurent Destailleur
9bff6f966b NEW Can add event from the card listing events 2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
bb5df3beeb Fix missing tab 2016-11-07 04:02:16 +01:00
Laurent Destailleur
90881f2fa9 FIX Sanitize title of ajax_dialog 2016-11-07 00:15:58 +01:00
Laurent Destailleur
4681c84e1d Better responsive 2016-11-06 12:16:10 +01:00
aspangaro
5ed79800e0 Begin to wok on Vat expense report integration in reports 2016-11-05 07:48:42 +01:00
Laurent Destailleur
0fea6f22a9 Change code to reduce need of jmobile 2016-11-05 03:27:56 +01:00
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d Fix dol_buildpath with parameter 3. Add phpunit tests 2016-10-31 10:37:58 +01:00
Laurent Destailleur
1382858f75 Fix log 2016-10-30 17:42:34 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
e9edbba093 NEW Usage of vat code seems ok everywhere. 2016-10-29 21:02:08 +02:00
Laurent Destailleur
658e30aa2f Close #4685 2016-10-29 18:09:57 +02:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Laurent Destailleur
22d2557a48 Clean page 2016-10-28 18:05:46 +02:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
fb0f5e3230 Better behaviour on small screen 2016-10-27 01:47:03 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
36c2b5afcd Responsive 2016-10-24 18:43:17 +02:00
Laurent Destailleur
bc2342e9a4 Fix bad link 2016-10-24 17:37:39 +02:00
Laurent Destailleur
3b05d00163 Better responsive design 2016-10-24 12:06:33 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:10:17 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00
Laurent Destailleur
3ca3b7ab78 Fix code comment 2016-10-21 10:36:11 +02:00
florian HENRY
5bf03de3fb Fix setup page 2016-10-19 22:24:04 +02:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
19532c9965 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2016-10-18 13:00:46 +02:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Juanjo Menent
f28c7bbc6d Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x 2016-10-18 10:20:09 +02:00
Juanjo Menent
6a944bb6a3 Fix: Bad localtaxes calc for Spain if VAT is 0 2016-10-18 10:11:42 +02:00
Laurent Destailleur
c1bf7c52f4 Add a line of filter in list of events related to thirdparty or projects 2016-10-18 00:02:18 +02:00
Laurent Destailleur
434b3ef643 Uniformize code and look and feel 2016-10-17 17:52:58 +02:00
Laurent Destailleur
46c985d8cc FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO 2016-10-17 15:16:21 +02:00