Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
49,918 Commits 36 Branches 189 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

840 Commits

Author SHA1 Message Date
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must 
include a print before. It is no more included into function.
 2015-10-17 02:01:13 +02:00
Laurent Destailleur
87c12717a7 NEW The thirdparties tabs, the contacts tabs and the members tabs are 
now presented using a new top banner, saving space and using a same way
to show address, status and navigation arrows.
 2015-10-16 20:16:28 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
Laurent Destailleur
e9aed15bed Work on the feature to select which field to show 2015-10-14 18:48:03 +02:00
Florian HENRY
00b610d87f FIX : fix HTML into formconfirm box 2015-10-14 08:23:52 +02:00
Laurent Destailleur
bd48ad265d The new banner tab is also on user card now 2015-10-11 15:21:21 +02:00
Laurent Destailleur
6ec77e2ca0 New banner card on contact card. 2015-10-11 12:27:04 +02:00
Laurent Destailleur
f4f7629037 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511 Start to work on a common banner for tabs (goal is to have a nicer and 
generic part for all element)
 2015-10-10 01:51:12 +02:00
Laurent Destailleur
f29c03c922 Start to work on a multiselect component to select which fields to show 
into dolibarr lists.
 2015-10-09 16:35:14 +02:00
Laurent Destailleur
2b17cd3353 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-08 23:50:24 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
Florian HENRY
1f2a86078a FIX : Always use type send in parameters in showCategories method 2015-10-08 11:03:08 +02:00
Laurent Destailleur
8d47a307bb Better use of space 2015-10-06 21:52:42 +02:00
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm 
[Qual] Replaced deprecated form_confirm()
 2015-09-26 08:48:16 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
f72f652d98 FIX Pb into pagination scroll widget 
FIX Style of previous-next card when using dolidroid
 2015-09-18 15:51:27 +02:00
Laurent Destailleur
4195eb3366 NEW Color category is visible onto the thumb of tags on thirdparty, or 
products cards.
 2015-09-17 20:20:03 +02:00
Laurent Destailleur
27b1f2ecc6 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-17 19:52:13 +02:00
Laurent Destailleur
57521f628c Fix bad path 2015-09-17 19:35:03 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Laurent Destailleur
38bae655ea Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 
Conflicts:
	htdocs/core/class/html.form.class.php
 2015-09-16 21:24:51 +02:00
Laurent Destailleur
e36928fd65 FIX #3529 2015-09-16 21:23:52 +02:00
aspangaro
2d2f59fe3f Fix : Class 'Categorie' not found in core\class\html.form.class.php 2015-09-14 22:33:48 +02:00
Laurent Destailleur
06d19a5a40 Work on a new widget 2015-09-12 11:33:22 +02:00
Laurent Destailleur
a44ab5168c Save memory. 2015-09-07 12:43:25 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
1a55159e35 Fix filter on prospect status 2015-08-24 14:59:46 +02:00
Laurent Destailleur
2c791e528d Revert "unit price not used if qty = 1" 
This reverts commit fb25f479f2.
 2015-08-12 23:15:32 +02:00
BENKE Charlie
83c4652a16 don't display ref_fourn if it's same as ref 
decrease size of the select list
 2015-08-04 15:22:36 +02:00
BENKE Charlie
fb25f479f2 unit price not used if qty = 1 
this line is too long for add unused information
 2015-08-04 13:39:01 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Marcos García de La Fuente
7185cfeb84 Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names 2015-07-18 14:48:59 +02:00
Gauthier
244d1839e4 FIX : load propal langs for availability traduction 2015-07-17 17:24:11 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
e571f681a0 Fix can refuse expense report 2015-07-15 15:39:50 +02:00
All-3kcis
6b54180678 Fix #3158 can't change date in invoices 2015-07-08 16:04:21 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Maxime Kohlhaas
84be022ee1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection 
Conflicts:
	htdocs/compta/paiement/cheque/card.php
 2015-07-02 13:45:32 +02:00
Laurent Destailleur
b766f99acc Uniformize look. 
Make code to manage link "Now" on calendar more generic.
 2015-06-30 21:50:24 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Maxime Kohlhaas
7486f2228d Debug : date fields were not transmitted by formconfirm 2015-06-26 18:50:57 +02:00