Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
60,834 Commits 36 Branches 189 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

11886 Commits

Author SHA1 Message Date
fappels
2be6011069 Fix product elephant verify for service 2017-01-23 20:59:32 +01:00
Laurent Destailleur
1878647d26 NEW Add statistics on supplier tab. 2017-01-23 20:54:52 +01:00
Laurent Destailleur
9a59fbada7 Fix missing info admin picto. Fix colspan. 2017-01-23 17:31:39 +01:00
florian HENRY
d714a52f95 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-23 11:35:11 +01:00
Laurent Destailleur
7622d3b2fb Fix missing info admin picto. Fix colspan. 2017-01-23 10:23:24 +01:00
florian HENRY
00ead9d262 Merge branch 'develop' into dev_NEW_copyeventfiles 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-01-23 08:33:05 +01:00
Laurent Destailleur
daf40ed573 NEW Direct open of card after a search if on record only found. 2017-01-22 23:35:32 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2017-01-21 21:56:24 +01:00
Laurent Destailleur
6ab9ba3284 Fix management of alternative language for Greek (el_CY) 2017-01-21 21:52:42 +01:00
Laurent Destailleur
b8a80f9311 Fix code comment and missing showLinkToObjectBlock hook declaration as 
an addreplace hook.
 2017-01-21 17:30:35 +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
9a5670787f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-21 12:26:50 +01:00
Laurent Destailleur
fc4aa96cd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php
 2017-01-20 21:02:05 +01:00
Laurent Destailleur
809e3ce4d5 Debug browser notification 2017-01-20 20:10:16 +01:00
Laurent Destailleur
b602e04fc8 Merge pull request #6272 from simnandez/develop 
NEW: Event notifications in browser
 2017-01-20 18:14:21 +01:00
Laurent Destailleur
0a4b29e1c4 Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation 
Fix pdf invoice with situation
 2017-01-20 18:10:24 +01:00
Laurent Destailleur
a250ba5f56 Close #6307 #6306 2017-01-20 17:52:52 +01:00
Juanjo Menent
d7edcdd03c Merge remote-tracking branch 'origin/develop' into develop 2017-01-20 15:56:13 +01:00
Juanjo Menent
2374aa351e Merge remote-tracking branch 'upstream/develop' into develop 2017-01-20 15:55:51 +01:00
Laurent Destailleur
ac32161711 Fix error in total of tasks 2017-01-20 14:36:56 +01:00
Laurent Destailleur
e66aabea85 Fix error in total of tasks 2017-01-20 14:35:18 +01:00
Laurent Destailleur
6780b20968 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43 Minor fixes 2017-01-20 14:10:57 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
9bb9d4d36e Fix position of field and tooltip 2017-01-20 12:08:33 +01:00
Ion
9270b2c54c Add supplier order/invoice to elementproperties 2017-01-20 10:57:41 +01:00
Laurent Destailleur
4047de82bd Fix navigation on projects 2017-01-20 10:27:37 +01:00
gauthier
a944c82d86 FIX : $progress_width initialized 2017-01-19 09:11:06 +01:00
Laurent Destailleur
03c1521cde Merge pull request #6271 from altatof/fix_extra_input 
FIX: extrafield input for varchar was not working with special char
 2017-01-18 16:53:43 +01:00
Laurent Destailleur
227b616ca3 Fix bad default value 2017-01-18 16:51:42 +01:00
Laurent Destailleur
ed98227303 Merge pull request #6292 from marcosgdf/remove-pdf-create-functions 
NEW Removed deprecated pdf_create functions
 2017-01-18 16:48:23 +01:00
Laurent Destailleur
562bdbc9f5 Merge pull request #6291 from gnovaro/patch-1 
Improve code style
 2017-01-18 16:44:56 +01:00
Laurent Destailleur
47c37855b1 Merge pull request #6287 from grandoc/develop 
update code for next php versions
 2017-01-18 16:36:39 +01:00
Laurent Destailleur
9d6f84c3a0 FIX Try a better fif for #6074 2017-01-18 16:27:23 +01:00
Laurent Destailleur
2566df8252 Merge pull request #6298 from benlo06/fix_shipping_contactid 
FIX getIdContact for shipping
 2017-01-18 15:53:32 +01:00
Laurent Destailleur
3336943ff2 Fix responsive 2017-01-18 15:49:12 +01:00
Benoit
73852beb4e FIX contactid for shipping pdf 2017-01-17 21:55:21 +01:00
Laurent Destailleur
82492dc023 Fix oauth2 token generation for Google. The refresh token was not 
received.
 2017-01-17 20:05:10 +01:00
Laurent Destailleur
bb95f139a8 Fix responsive 2017-01-17 20:04:41 +01:00
arnaud
39f35bbaab FIX all dolibarr versions about project list and ajax completion bug 2017-01-17 11:17:40 +01:00
Laurent Destailleur
16779be162 Fix missing email/multicompany field 2017-01-17 10:51:30 +01:00
Laurent Destailleur
1ded1bd52a Fix: missing email 2017-01-17 10:34:35 +01:00
Marcos García de La Fuente
8225b06018 NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions 2017-01-16 21:59:02 +01:00
Gustavo Novaro
0f6cb52376 Improve code style 
Replace var for public and private.
 2017-01-16 17:40:13 -03:00
Philippe GRAND
2525a6e3a4 update code for next php versions 2017-01-16 17:24:50 +01:00
Juanjo Menent
9674bdef54 Best directory for img 2017-01-16 13:40:57 +01:00
Juanjo Menent
e232c1c408 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-16 13:37:01 +01:00