lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,346 Commits 43 Branches 150 Tags 886 MiB
52f20a1047
Commit Graph

5901 Commits

Author SHA1 Message Date
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +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
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
2867e31a63 Fix CSS 2019-07-27 01:13:39 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
f39f710fd9
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter 
Fix lost filter in action list
 2019-07-22 18:44:22 +02:00
Maxime Kohlhaas
7ec8b48b18 Fix lost filter in action list 2019-07-21 22:21:11 +02:00
florian HENRY
b046bcc197 fix warning php 2019-07-20 15:19:25 +02:00
florian HENRY
d03d79222e fix warning php 2019-07-20 15:15:48 +02:00
florian HENRY
d88fec52bf fix warining message 2019-07-20 15:07:59 +02:00
Laurent Destailleur
e5c3945ec3 FIX delete of links between objects 2019-07-19 18:10:45 +02:00
Laurent Destailleur
58428cefc0 Fix phpcs 2019-07-18 18:53:51 +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
Laurent Destailleur
a20a121558
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned 
FIX: socpeople assigned list in action com list
 2019-07-18 17:20:41 +02:00
John Botella
b5d348356d Fix socpeople assigned list in action com list 2019-07-17 16:49:41 +02:00
Marc de Lima Lucio
464bda996c FIX: propal createFrom hook: undefined parameter attached 2019-07-16 13:59:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/action/card.php
 2019-07-04 12:22:40 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
18348fea93 Fix sort on date on agenda list 2019-06-22 11:34:16 +02:00
Frédéric FRANCE
f1d64ad164
Update peruser.php 2019-06-17 23:02:54 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:58:58 +02:00
Frédéric FRANCE
ad95b66842
Warning: A non-numeric value encountered 2019-06-06 10:12:01 +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
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Maxime Kohlhaas
6dd01e86e9 Fix : avoid warning and uniformize var use 2019-05-31 15:53:23 +02:00
Frédéric FRANCE
48d15032af
Update linkedobjectblock.tpl.php 2019-05-29 11:28:07 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
15de8a9497 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/card.php
 2019-05-27 19:25:53 +02:00
Laurent Destailleur
1c6ddd25c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 19:23:54 +02:00
Laurent Destailleur
93c395fe10 FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL 2019-05-27 19:22:51 +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
a93cbd4320 FIX Look and feel v10 2019-05-21 21:47:25 +02:00
Laurent Destailleur
c3b9c08219 CSS 2019-05-21 21:36:48 +02:00
Laurent Destailleur
fdeb12a909 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/card.php
 2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea FIX Error management when MAILING_NO_USING_PHPMAIL is set 2019-05-21 21:16:06 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
ATM-Nicolas
5def839813 FIX : Padding on create project icon 2019-05-20 11:56:26 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +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
florian HENRY
ebe37df9db scrunitizer 2019-05-18 16:19:44 +02:00
florian HENRY
47ae988b57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 16:18:22 +02:00
florian HENRY
12a8008107 scrunitizer 2019-05-18 16:18:14 +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
ab3ad77704 FIX : Sale representative column didn't increase nbfield variable on proposal list 2019-05-03 10:55:51 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/website.inc.php
 2019-05-02 14:41:56 +02:00
Laurent Destailleur
79754eb326 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/remx.php
 2019-05-02 14:39:30 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Frédéric FRANCE
d9a1c2b235
Fix do not delete all discount when splitting 2019-04-30 13:54:50 +02:00
Laurent Destailleur
ee5d50b905 css 2019-04-27 13:25:21 +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
Abbes Bahfir
dccc8b0be3 Fix:Same action in both cases 2019-04-24 08:48:36 +01:00
Laurent Destailleur
3b04d2fe9b Fix warnings 2019-04-23 13:21:17 +02:00
Laurent Destailleur
7f4b09c482 Fix warnings 2019-04-23 13:20:44 +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
Laurent Destailleur
84ec39f043 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-23 12:25:53 +02:00
Laurent Destailleur
bf7fcce1b2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-23 12:24:25 +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
212b058f46 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-17 01:18:46 +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
Laurent Destailleur
5c53044863
Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events 
FIX: actioncomm: sort events by date after external calendars and hook
 2019-04-16 23:28:30 +02:00
Laurent Destailleur
c0defe3965
Update index.php 2019-04-16 23:27:45 +02:00
Marc de Lima Lucio
1669d497b4 FIX: actioncomm: sort events by date after external calendars and hook 2019-04-16 17:36:27 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
ATM john
29b31bd7ab New title button first step 2019-04-11 00:38:44 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Frédéric FRANCE
4d43cd4927
Update card.php 2019-04-05 14:46:31 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
661a984b8e
Merge pull request #10880 from altatof/condpay 
allow empty value for payment conditions like in orders
 2019-03-26 20:53:20 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates 
FIX: Disallow line start date after end date
 2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc 
NEW : add constant NO_CONCAT_DESCRIPTION
 2019-03-22 12:56:46 +01:00
Philippe GRAND
62d63e399e translation 2019-03-22 09:41:22 +01:00
Laurent Destailleur
48a0c447b4 Fix test on draft status regression 2019-03-21 21:00:06 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE 
Standardize code of setDraft.
 2019-03-21 17:37:56 +01:00
Frédéric FRANCE
013e536f32
Update actioncomm.class.php 2019-03-19 12:49:54 +01:00
Laurent Destailleur
b10690ce88
Merge pull request #10874 from grandoc/translation 
translation
 2019-03-19 11:14:40 +01:00