Laurent Destailleur
|
190f432c23
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-12-11 11:07:22 +01:00 |
|
Laurent Destailleur
|
4969af8c74
|
Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
ChangeLog
htdocs/product/card.php
|
2016-12-11 11:04:15 +01:00 |
|
BENKE Charlie
|
8589f077c0
|
Bad return on linkback
|
2016-12-10 22:54:13 +01:00 |
|
Sergio Sanchis Climent
|
79d6fa334b
|
FIX: Consistent description for add or edit product
|
2016-12-08 13:12:10 +01:00 |
|
Sergio Sanchis Climent
|
6dfeaabad5
|
FIX: #6062
|
2016-12-01 22:28:29 +01:00 |
|
Sof
|
e05de2942b
|
Fix: update informations
|
2016-11-29 12:19:01 +01:00 |
|
Sof
|
53d1dbf4b9
|
Fix: Codebar suggestion in edit mode
|
2016-11-29 12:06:58 +01:00 |
|
Laurent Destailleur
|
663f7938f8
|
Fxi responsive design
|
2016-11-27 20:02:57 +01:00 |
|
Laurent Destailleur
|
16ce156631
|
Fix responsive design
|
2016-11-25 18:32:52 +01:00 |
|
Laurent Destailleur
|
381b77850c
|
Fix do not show cloning of virtual product if option is off
|
2016-11-14 02:08:41 +01:00 |
|
BENKE Charlie
|
6da82762f2
|
Update card.php
|
2016-11-05 11:09:54 +01:00 |
|
Laurent Destailleur
|
5d655d47fe
|
Enhance css
|
2016-10-25 12:36:14 +02:00 |
|
BENKE Charlie
|
272b16fe1a
|
Duplicate product declation
Once is enough
|
2016-10-06 08:36:21 +02:00 |
|
Laurent Destailleur
|
0ab377440d
|
Complete param of setValueFrom
|
2016-09-12 20:16:39 +02:00 |
|
Laurent Destailleur
|
1f9aa856d5
|
NEW the list of linked files on card does not forget external links.
|
2016-09-12 18:37:40 +02:00 |
|
Laurent Destailleur
|
2587958c89
|
Introduce hidden constant PRODUCT_ADD_FORM_ADD_TO for an old feature not
used so we can disable/enabled if we want.
|
2016-09-12 18:15:01 +02:00 |
|
Laurent Destailleur
|
524dd79198
|
Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
|
2016-08-31 00:16:07 +02:00 |
|
Laurent Destailleur
|
8b959a09f2
|
Fix missing /form
|
2016-08-29 16:12:56 +02:00 |
|
Laurent Destailleur
|
989d6e7bc8
|
Fix responsive design
|
2016-08-28 16:27:15 +02:00 |
|
Laurent Destailleur
|
92ef3f0cd8
|
Fix responsive design
|
2016-08-28 16:17:23 +02:00 |
|
Laurent Destailleur
|
fac28f9589
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
|
2016-08-28 02:40:20 +02:00 |
|
Laurent Destailleur
|
88afc4ad5a
|
Merge pull request #5625 from aspangaro/4.0-p42
Uniformize presentation, add button cancel everywhere
|
2016-08-17 16:11:59 +02:00 |
|
aspangaro
|
b7420372b7
|
Uniformize presentation, add button cancel everywhere
|
2016-08-12 22:53:30 +02:00 |
|
aspangaro
|
a1d1396919
|
Uniformize presentation
|
2016-08-10 07:40:40 +02:00 |
|
Laurent Destailleur
|
4d4fc87e2b
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
|
2016-08-09 13:26:08 +02:00 |
|
Laurent Destailleur
|
e168888c59
|
NEW Reduce nb of picto on ref into list, merging preview and download
|
2016-08-05 12:20:11 +02:00 |
|
Laurent Destailleur
|
1b10e27618
|
Fix bad link
|
2016-08-05 04:20:38 +02:00 |
|
Laurent Destailleur
|
c2e81b6edb
|
Fix colspan
|
2016-08-05 00:36:58 +02:00 |
|
Laurent Destailleur
|
aae2086ada
|
Move notes on dedicated tabs like other elements.
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
|
2016-07-28 13:53:17 +02:00 |
|
Laurent Destailleur
|
73f574b649
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/repair.php
|
2016-07-12 19:30:01 +02:00 |
|
Laurent Destailleur
|
f972b15f5f
|
FIX #5068
|
2016-07-12 19:22:14 +02:00 |
|
Laurent Destailleur
|
b72123e7ec
|
Fix custom code must be visible only for products
|
2016-07-11 11:43:59 +02:00 |
|
Laurent Destailleur
|
3611161b67
|
Fix custom code should not appears on services
|
2016-06-30 19:35:11 +02:00 |
|
Maxime Kohlhaas
|
c3cf72afcc
|
Merge pull request #5296 from aschio/develop
FIX #5134
|
2016-06-04 18:46:33 +02:00 |
|
cla
|
b440ad4e7b
|
FIX #5134: fixed action 'edit' top page
|
2016-06-04 18:44:10 +02:00 |
|
cla
|
9ac05fa8f2
|
FIX #5134
|
2016-06-04 18:17:13 +02:00 |
|
Laurent Destailleur
|
89d37ccc62
|
Fix translation
|
2016-05-17 21:55:39 +02:00 |
|
Laurent Destailleur
|
901c7c9517
|
Link "Backtolist" was missing on products
|
2016-05-17 02:16:28 +02:00 |
|
Laurent Destailleur
|
6a0f16e9aa
|
FIX #5189
|
2016-05-13 20:39:31 +02:00 |
|
Sergio Sanchis Climent
|
cd4e104b76
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Conflicts:
htdocs/product/card.php
|
2016-04-29 12:39:00 +02:00 |
|
Juanjo Menent
|
9909143c42
|
Merge pull request #5076 from aspangaro/4.0-p21
FIX: For external api, don't use lengt_accountg without module accountancy activated
|
2016-04-29 11:55:55 +02:00 |
|
Sergio Sanchis Climent
|
32d641b66b
|
Bug show product if no accounting enabled
|
2016-04-28 11:12:04 +02:00 |
|
Laurent Destailleur
|
b639849a47
|
Page for proposals must be called card.php (one of last architecture
change before the freeze)
|
2016-04-23 15:37:22 +02:00 |
|
aspangaro
|
a8aeba3ade
|
FIX: For external api, don't use lengt_accountg without module accountancy activated
|
2016-04-23 07:05:16 +02:00 |
|
Laurent Destailleur
|
d347595d86
|
Merge pull request #5041 from aspangaro/4.0-p20
FIX: Accounting library already declared in line 54
|
2016-04-21 01:57:44 +02:00 |
|
aspangaro
|
bb554a73bd
|
FIX: Accounting library already declared in line 54
|
2016-04-19 06:18:34 +02:00 |
|
Marcos García de La Fuente
|
e2c86d3fd8
|
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
|
2016-04-17 15:24:22 +02: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
|
a2e9832c8d
|
Revert "Corrected non-static usages of Form::multiselectarray function"
This reverts commit 0a53cdd88f.
|
2016-03-25 15:34:43 +01:00 |
|
Laurent Destailleur
|
630f5a632d
|
Revert "Corrected non-static usages of Form::selectarray function"
This reverts commit 87cd6e1e40.
|
2016-03-25 15:34:37 +01:00 |
|