Abbes Bahfir
|
bf2d052d62
|
Fix:syntax error in sql query
|
2019-07-31 17:48:17 +01:00 |
|
Laurent Destailleur
|
11e3aa5860
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 11:07:11 +02:00 |
|
Laurent Destailleur
|
7931f0b422
|
Fix sql error
|
2019-07-29 11:06:39 +02:00 |
|
Laurent Destailleur
|
a5e3adc6f1
|
Fix travis
|
2019-07-29 10:51:17 +02:00 |
|
Laurent Destailleur
|
db461792a0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 01:36:35 +02:00 |
|
Laurent Destailleur
|
9a7113f4f5
|
FIX Update the file index table when we validate/rename a ref.
|
2019-07-28 22:26:55 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Laurent Destailleur
|
e5c3945ec3
|
FIX delete of links between objects
|
2019-07-19 18:10:45 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
3cffd70ed3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
|
2019-07-18 18:09:37 +02:00 |
|
Marc de Lima Lucio
|
464bda996c
|
FIX: propal createFrom hook: undefined parameter attached
|
2019-07-16 13:59:00 +02:00 |
|
Laurent Destailleur
|
0a7d70829f
|
Translation of some comments
|
2019-07-05 21:37:25 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
ptibogxiv
|
7f11077f1e
|
Update propal.class.php
|
2019-06-25 18:16:11 +02:00 |
|
ptibogxiv
|
df0d540ffb
|
Update propal.class.php
|
2019-06-25 15:47:16 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
Laurent Destailleur
|
e99cf13ccf
|
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
|
2019-06-20 03:27:45 +02:00 |
|
Nicolas ZABOURI
|
2e4db8c83c
|
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
|
2019-06-19 08:39:05 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Laurent Destailleur
|
a74eaaff4d
|
Fix sort of linked elements
|
2019-06-17 15:54:54 +02:00 |
|
Laurent Destailleur
|
330842d67e
|
Update list.php
|
2019-06-12 13:14:44 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
Laurent Destailleur
|
ba68e3d7ff
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/website/class/website.class.php
|
2019-06-04 18:47:22 +02:00 |
|
Laurent Destailleur
|
36df2f1026
|
Fix css
|
2019-06-04 18:45:01 +02:00 |
|
Laurent Destailleur
|
7b3242693b
|
FIX default value for duration of validity can be set from generic
feature.
|
2019-06-04 18:17:07 +02:00 |
|
Frédéric FRANCE
|
48d15032af
|
Update linkedobjectblock.tpl.php
|
2019-05-29 11:28:07 +02:00 |
|
Laurent Destailleur
|
45e6c14594
|
Merge pull request #11226 from ATM-Nicolas/fix_icon_with_padding
FIX : Padding on create project icon
|
2019-05-21 22:41:52 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +02:00 |
|
ATM-Nicolas
|
5def839813
|
FIX : Padding on create project icon
|
2019-05-20 11:56:26 +02:00 |
|
ATM-Nicolas
|
d58603bd1e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column
|
2019-05-20 09:13:37 +02:00 |
|
ATM-Nicolas
|
6be48e6952
|
NEW : Amount HT invoiced column in propal list
|
2019-05-20 08:59:44 +02:00 |
|
Laurent Destailleur
|
c6ccb92a51
|
Fix table shown when there is no perm
Fix edit admin status of another admin
|
2019-05-19 01:41:42 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
Laurent Destailleur
|
3def11d5c9
|
Standardize translation
|
2019-05-10 19:32:46 +02:00 |
|
Laurent Destailleur
|
aaeb7dc9d6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2019-05-10 17:45:33 +02:00 |
|
Laurent Destailleur
|
9de0e69456
|
FIX column project into list
|
2019-05-10 15:11:06 +02:00 |
|
Laurent Destailleur
|
22c548e80b
|
Fix sql
|
2019-05-10 14:46:43 +02:00 |
|
Laurent Destailleur
|
5625c94c44
|
Fix missing label on project tooltip
|
2019-05-10 14:40:15 +02:00 |
|
Laurent Destailleur
|
0e8184332e
|
Fix missing label on project tooltip
|
2019-05-10 14:39:05 +02:00 |
|
Laurent Destailleur
|
d8c1c24028
|
Fix syntax error
|
2019-05-09 19:46:10 +02:00 |
|
Laurent Destailleur
|
a5b1de4f6a
|
Fix tab that should not be visible
|
2019-05-09 17:52:55 +02:00 |
|
ATM-Nicolas
|
77d3f22163
|
NEW : Amount invoiced column in propal list
|
2019-05-07 14:39:16 +02:00 |
|
ATM-Nicolas
|
ab3ad77704
|
FIX : Sale representative column didn't increase nbfield variable on proposal list
|
2019-05-03 10:55:51 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Laurent Destailleur
|
4d92d7731c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
|
2019-04-23 12:32:08 +02:00 |
|
florian HENRY
|
f412ce6a9c
|
fix #11023
|
2019-04-17 10:49:39 +02:00 |
|
Laurent Destailleur
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02:00 |
|
Laurent Destailleur
|
b5bf6830e9
|
Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
|
2019-04-17 01:13:59 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|