Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-27 11:13:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 38 Branches 191 Tags
e3a0220658b7dfc05bfb499ace614fda170e4f3b
Commit Graph

7858 Commits

Author SHA1 Message Date
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +02:00
Abdessalam@MEGALOGI
1e6273b92d Update card.php 
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
 2020-07-18 23:11:17 +02:00
Laurent Destailleur
8b5f4fe9a6 Fix massaction delete on events 2020-07-11 12:21:53 +02:00
Laurent Destailleur
b6452dbbc0 Merge pull request #14196 from Tim-Otte/fix-proposals-urgent 
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
 2020-07-10 02:51:25 +02:00
Laurent Destailleur
46119dc786 Fix per user 2020-07-09 12:49:48 +02:00
Laurent Destailleur
b2bd90ae1a Fix link to list of event 2020-07-09 12:33:28 +02:00
Laurent Destailleur
9592fdb3fc CSS 2020-07-09 11:55:16 +02:00
Laurent Destailleur
1dfd2d565b FIX Reposition and nav 2020-07-08 18:18:47 +02:00
Laurent Destailleur
96d935832c FIX Reposition and nav 2020-07-08 18:18:08 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
96729769f7 Standardize Agenda view 2020-07-08 18:06:14 +02:00
Tim Otte
a73f77cfef Fixed same error like before 2020-07-07 12:43:15 +02:00
Laurent Destailleur
4fd970af28 Fix phpcs 2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b NEW Can change VAT rate of all lines of a draft object in one step. 2020-07-06 22:48:22 +02:00
Laurent Destailleur
f72a836231 Fix look and feel v12 2020-07-06 16:59:25 +02:00
Laurent Destailleur
4dcc073b3a Fix param GETPOST 2020-07-06 16:54:30 +02:00
Laurent Destailleur
3939a640e9 Fix note in creation 2020-07-06 16:52:28 +02:00
stickler-ci
19eef8aa93 Fixing style errors. 2020-07-06 01:26:46 +00:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Tim Otte
bce0a93227 Hotfix for an error in v12 2020-07-03 00:33:54 +02:00
Laurent Destailleur
0ea55209ae Merge pull request #14165 from ptibogxiv/patch-345 
FIX non numeric value on comm/card.php
 2020-07-03 00:24:32 +02:00
Regis Houssin
a5431a40da FIX missing possibility to change entity when propal cloning 2020-07-02 10:16:20 +02:00
ptibogxiv
cc132775f3 FIX non numeric value on comm/car.php 2020-07-01 16:18:19 +02:00
Tim Otte
94a1d71fba Hotfix for an error in v12 2020-06-30 15:20:30 +02:00
Laurent Destailleur
0aa08edb38 Merge pull request #14139 from OPEN-DSI/new-societe-card-set-sales-representative 
NEW can edit and set sales representatives directly on thirdparty card
 2020-06-28 21:08:24 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
lvessiller
ad36447295 NEW can edit and set sales representatives directly on thirdparty card 2020-06-26 12:20:53 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
18c23680f7 Fix bad object 2020-06-25 12:17:06 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006 Fix alert picto of expired services not visible 
Fix CSS
 2020-06-23 11:27:40 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Laurent Destailleur
bb3320f103 FIX #14104 2020-06-20 18:34:19 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler 
<sak1.s3curity@gmail.com>
 2020-06-15 15:08:52 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e94ef09977 css 2020-06-10 22:24:15 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
94e02269ee Fix: missing fk_project 2020-05-31 00:20:01 +02:00
Laurent Destailleur
ddebe1bbba FIX Missing ref into popup 2020-05-30 23:52:47 +02:00
Laurent Destailleur
02bf646abe FIX Missing ref into popup 2020-05-30 23:51:02 +02:00
stickler-ci
029f5570e5 Fixing style errors. 2020-05-28 12:55:29 +00:00
Supermanu
0baea21947 NEW Add mass deletion for events 
Only users with the right `allactions->delete` will be able to mass delete.
 2020-05-28 14:45:54 +02:00