lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,041 Commits 43 Branches 150 Tags 886 MiB
13.0
Commit Graph

813 Commits

Author SHA1 Message Date
Laurent Destailleur
b6be42e103 FIX List of viewed projects too large in task widget 2020-02-18 12:40:50 +01:00
Pierre Ardoin
f8e18a3826
Fix Not displayed email 2020-02-17 19:25:25 +01:00
Pierre Ardoin
a773b86ad1
Fix not displayed value 2020-02-17 19:23:48 +01:00
Pierre Ardoin
29cfd6d857
Fix issue with Multicompany 
Before : can't find photo

Now : ok
 2020-02-17 19:18:22 +01:00
Pierre Ardoin
f1bbe1c64d
Fix issue not show photo. 2020-02-17 19:09:58 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
 2020-02-05 14:38:19 +01:00
Laurent Destailleur
63ba601906
Update box_project.php 2020-02-05 12:39:00 +01:00
Pierre Ardoin
81ed70ffc7
Update box_project.php 2020-02-05 09:18:39 +01:00
Pierre Ardoin
d5b74a8ca3
Update box_project.php 2020-02-05 09:06:43 +01:00
Pierre Ardoin
262d889700
Update box_project.php 2020-02-05 08:50:51 +01:00
Pierre Ardoin
d93a597a1e
Fix Compatbility with Multicompany 
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
 2020-02-04 09:17:02 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
4765198af2 Clean code from using deprecated field amount 2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
fa305a1471
Update box_factures_imp.php 2020-01-23 11:14:27 +01:00
AdrianDominik
cc96da2741 Fix: strict mode mysql compatibility 2020-01-23 10:47:52 +01:00
stickler-ci
ce3e658608 Fixing style errors. 2019-12-31 07:36:40 +00:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
Frédéric FRANCE
9fdd1357d0
The variable $num does not seem to be defined for all execution paths 2019-12-16 20:21:06 +01:00
Frédéric FRANCE
9357bfd98e
doxygen 2019-12-12 08:17:14 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Laurent Destailleur
3a687b1dae Fix box of task hidden if tasks are not used 2019-11-26 17:44:21 +01:00
Alexandre SPANGARO
f4e1361d06 NEW small fix 2019-11-22 06:53:05 +01:00
Alexandre SPANGARO
2f064567ef NEW Add shipment widget 2019-11-21 07:50:44 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
562e219cc5
Merge pull request #12314 from frederic34/patch-7 
add thirdparty email in box_propales
 2019-11-04 20:51:57 +01:00
Laurent Destailleur
d934f5e920 Fix wrap 2019-11-04 11:44:46 +01:00
Laurent Destailleur
abc6f6ccae Fix css 2019-11-04 11:43:07 +01:00
Laurent Destailleur
5497e1e103 css 2019-11-04 11:42:27 +01:00
Laurent Destailleur
666e60a883 Responsive 2019-11-04 11:40:54 +01:00
Laurent Destailleur
1053112843 css 2019-11-04 11:07:08 +01:00
Laurent Destailleur
ed3f95b4a6 Responsive 2019-11-04 10:55:08 +01:00
Frédéric FRANCE
60198190fc
Update box_propales.php 2019-11-03 23:55:04 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Frédéric FRANCE
18b662e430
Update box_graph_orders_permonth.php 2019-11-01 16:01:08 +01:00
Frédéric FRANCE
d14015e3df
Update box_graph_invoices_permonth.php 2019-11-01 15:59:17 +01:00
Frédéric FRANCE
dab8aabb16
Update box_graph_invoices_supplier_permonth.php 2019-11-01 15:58:30 +01:00
Frédéric FRANCE
93b00038f8
Update box_graph_orders_supplier_permonth.php 2019-11-01 15:57:40 +01:00
Frédéric FRANCE
5bdb9da5c5
Update box_graph_invoices_supplier_permonth.php 2019-11-01 15:56:15 +01:00
Frédéric FRANCE
931f2b809d
Update box_graph_orders_permonth.php 2019-11-01 15:52:13 +01:00
Frédéric FRANCE
44c8cd9d23
give a value by default 
The variable $fileurlnb does not seem to be defined for all execution paths
 2019-11-01 15:48:55 +01:00
Laurent Destailleur
aa306bf5d4 Debug widgets 2019-10-31 23:50:36 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
248016cd5d
Merge pull request #12241 from frederic34/contactphone 
Contactphone
 2019-10-30 02:52:11 +01:00
Laurent Destailleur
66337ec234 NEW Add widgets for BOMs and MOs 2019-10-30 00:36:47 +01:00
Frédéric FRANCE
043a71442f
contact phone 2019-10-27 20:06:16 +01:00
Frédéric FRANCE
486047c357
Update box_produits.php 2019-10-18 23:14:43 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
205967976c Can set a BOM to draft 2019-10-16 18:35:15 +02:00
Laurent Destailleur
7a927a22e3
Merge pull request #12137 from frederic34/patch-15 
Update box_task.php
 2019-10-16 14:31:01 +02:00
Laurent Destailleur
1d7efbdc64
Merge pull request #12138 from frederic34/patch-16 
FIX datec in box ticket
 2019-10-16 13:02:59 +02:00
Laurent Destailleur
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00
Frédéric FRANCE
194072fc60
Update box_last_ticket.php 2019-10-15 00:14:43 +02:00
Frédéric FRANCE
a53c7cfca8
Update box_last_modified_ticket.php 2019-10-15 00:13:52 +02:00
Frédéric FRANCE
b77d2f2ff2
Update box_task.php 2019-10-14 23:27:37 +02:00
Laurent Destailleur
b8a27a47aa
Merge pull request #12112 from frederic34/patch-17 
Update box_last_modified_ticket.php
 2019-10-14 20:57:18 +02:00
Frédéric FRANCE
92e4b962fa
Update box_last_modified_ticket.php 2019-10-13 10:37:30 +02:00
Frédéric FRANCE
67278e4781
Update box_last_ticket.php 2019-10-13 10:18:41 +02:00
Laurent Destailleur
114e741975
Merge pull request #12079 from frederic34/patch-17 
Update box_factures_imp.php
 2019-10-11 15:54:37 +02:00
Laurent Destailleur
7ce01c5ceb Look and feel v11 2019-10-11 14:42:55 +02:00
Frédéric FRANCE
90257dc087
Update box_factures_imp.php 2019-10-10 08:09:39 +02:00
Laurent Destailleur
db651a607d Use fontawesome for img_warning 2019-10-09 17:33:46 +02:00
Frédéric FRANCE
c68de09ba9
use $this->db in box 2019-10-07 20:27:51 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal 
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
 2019-10-07 14:24:22 +02:00
Alexandre SPANGARO
8668e7157a Add bookmark fa-icon 2019-10-03 21:00:59 +02:00
Alexandre SPANGARO
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
f91242c66c Fix css 2019-10-01 13:37:08 +02:00
Frédéric FRANCE
7872a93605 Update box_commandes.php 2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586 Update box_supplier_orders.php 2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514 Update box_prospect.php 2019-10-01 11:36:24 +02:00
Laurent Destailleur
76bd09cfb5
Merge pull request #12002 from frederic34/patch-18 
Update box_supplier_orders.php to show email
 2019-10-01 11:16:40 +02:00
Laurent Destailleur
2d8e3aad5b
Merge pull request #12001 from frederic34/patch-17 
Update box_prospect.php to show email
 2019-10-01 11:13:01 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
f3f2ab8aad
Update box_commandes.php 2019-09-30 22:45:28 +02:00
Frédéric FRANCE
466e48761c
Update box_supplier_orders.php 2019-09-30 22:43:13 +02:00
Frédéric FRANCE
d0e9e9568a
Update box_prospect.php 2019-09-30 22:40:07 +02:00
Alexandre SPANGARO
8dea427f58 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-30 21:23:27 +02:00
Laurent Destailleur
0a75c0645d
Merge branch 'develop' into develop_fix_land_loading 2019-09-30 15:15:12 +02:00
Laurent Destailleur
a9f88b84d8
Merge pull request #11981 from frederic34/patch-12 
Update box_supplier_orders_awaiting_reception.php
 2019-09-29 16:26:44 +02:00
Alexandre SPANGARO
8e42ac8cd0 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-28 22:31:08 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Frédéric FRANCE
710154fb9d
Update box_supplier_orders_awaiting_reception.php 2019-09-28 09:00:52 +02:00
ATM john
d7d5b87cf2 Fix lang loaded 2019-09-27 21:29:55 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Laurent Destailleur
6de173494b
Merge pull request #11924 from frederic34/patch-15 
Update box_fournisseurs.php to see email
 2019-09-27 14:01:18 +02:00
Laurent Destailleur
13473be6e9
Merge pull request #11923 from frederic34/patch-14 
Update box_contacts.php to see email
 2019-09-27 12:16:06 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1b2558bb1f typo 2019-09-23 21:43:11 +02:00
Alexandre SPANGARO
e5268f98c2 Correct Stickler 2019-09-23 20:48:30 +02:00
Alexandre SPANGARO
a005408d83 NEW Accountancy - Add an option to hide FAQ on index and add widget in area 2019-09-23 20:42:50 +02:00
Frédéric FRANCE
8f41e0f9fe
clean code 2019-09-23 18:39:21 +02:00
Frédéric FRANCE
57509f1312
box ficheinter 2019-09-23 18:13:26 +02:00
Frédéric FRANCE
31094936c1
wip 2019-09-23 10:56:11 +02:00
Frédéric FRANCE
c01ab451cc
Update box_fournisseurs.php 2019-09-17 23:04:43 +02:00
Frédéric FRANCE
c38c0bec1c
Update box_fournisseurs.php 2019-09-17 23:03:37 +02:00
Frédéric FRANCE
87d41256d4
Update box_contacts.php 2019-09-17 22:59:23 +02:00
ATM john
9db2e27289 add widget box for supplier orders awaiting reception 2019-09-10 21:47:08 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
ATM john
a639724b92 Fix follow tasks and time spent 2019-09-08 18:13:15 +02:00
Laurent Destailleur
87c596a934 Fix responsive 2019-09-05 15:58:54 +02:00
Alexandre SPANGARO
4fe141c9f1 FIX Nowrap missing on amount in boxes 2019-09-05 12:05:50 +02:00
Laurent Destailleur
43e0655dd5 Fix code style and var type 2019-08-31 01:54:21 +02:00
ptibogxiv
c8cf06ed2f
Update box_birthdays_members.php 2019-08-23 14:59:12 +02:00
ptibogxiv
73bcf3110d
NEW birthday boxe for member 
use new function for displays the X next birthday by date ASC
 2019-08-23 13:56:04 +02:00
ATM john
1ffb013371 add filter 2019-08-12 15:24:07 +02:00
ATM john
f10f29f632 Add filters 2019-08-12 01:01:16 +02:00
ATM john
09c1289802 Fix task widget and improve its display 2019-08-10 22:48:07 +02:00
Alexandre SPANGARO
7eb48a3f9c Fix month of the fiscal year start min 1 max 12 / january = 1 2019-08-03 06:04:42 +02:00
Alexandre SPANGARO
b146004966 Fix travis 2019-07-30 11:06:40 +02:00
Alexandre SPANGARO
3e69421ec3 Fix travis 2019-07-28 07:33:57 +02:00
Alexandre SPANGARO
83e2f71e07 Fix travis 2019-07-27 07:56:33 +02:00
Alexandre SPANGARO
053ae8224b NEW Box use fiscal year (Thanks Yves57) 2019-07-27 06:36:39 +02:00
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
3b0f1c733f Fix missing token 2019-07-02 15:00:17 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Alexandre SPANGARO
4a84dcaa62 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-06-23 21:47:34 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Alexandre SPANGARO
abfb708044 Merge branch 'develop' into 10.0_intracommreport 2019-06-19 21:43:40 +02:00
Alexandre SPANGARO
9bde7c5229 Nowrap on amount 2019-06-19 09:21:18 +02:00
Laurent Destailleur
65b702d854 responsive 2019-06-03 16:37:31 +02:00
Laurent Destailleur
8ef209bc04 Fix responsive 2019-06-03 16:30:49 +02:00
Alexandre SPANGARO
11015dd072 WIP 2019-05-21 09:55:41 +02:00
Alexandre SPANGARO
f9e3a958c4 NEW Module Intracomm report 2019-05-19 10:44:09 +02:00
Laurent Destailleur
02b8e77df2 Fix responsive 2019-05-10 16:14:05 +02:00
Laurent Destailleur
00f6265870 Fix responsive 2019-05-10 09:33:21 +02:00
Maxime Kohlhaas
e090cd6f87 New box birthdays of the month 2019-03-17 16:55:26 +01:00
Laurent Destailleur
ca31f654e7 Reduce text for graph title 2019-03-14 23:42:22 +01:00
Laurent Destailleur
935fe7c22a Debug and enhance modulebuilder. 2019-03-10 19:33:28 +01:00
Frédéric FRANCE
92c5c15033
add visibility 2019-02-28 20:48:07 +01:00
Frédéric FRANCE
ba4ca5d7c2
add visibility 2019-02-28 00:15:32 +01:00
Laurent Destailleur
401f587868 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_project.php
 2019-02-27 02:27:33 +01:00
bomuux
9c5a4e303c SQL error in box_project.php 
Corrected a bug : for an internal user with no rights to see all
projects, the project box on home cause an error in log.
Finally a lot of simplification because
Project::getProjectsAuthorizedForUser do most of the filtering.

Conflicts:
	htdocs/core/boxes/box_project.php
 2019-02-27 01:44:15 +01:00
Laurent Destailleur
64f81e8f65
Merge pull request #10628 from bomuux/patch-4 
FIX: sql error in box_project.php
 2019-02-27 01:38:03 +01:00
Laurent Destailleur
d6651f3998
Update box_project.php 2019-02-27 01:37:20 +01:00
Frédéric FRANCE
c7df326a91
replace html code by html5 2019-02-23 22:31:57 +01:00
Frédéric FRANCE
c3d1ed73d2
variables does not seem to be defined for all execution paths 2019-02-23 11:17:07 +01:00
Laurent Destailleur
4296f959ca Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION 
Reorganize levels of menu accountancy
 2019-02-20 04:55:35 +01:00
bomuux
c22be202d9
SQL error in box_project.php 
Corrected a bug : for an internal user with no rights to see all projects, the project box on home cause an error in log.
Finally a lot of simplification because Project::getProjectsAuthorizedForUser do most of the filtering.
 2019-02-18 23:17:03 +01:00
Frédéric FRANCE
529354718b
replace html align by class in boxes 2019-02-09 15:24:21 +01:00
Laurent Destailleur
57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/index.php
 2019-02-03 21:14:44 +01:00
Laurent Destailleur
efe5cd3dd8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 21:13:06 +01:00
Laurent Destailleur
72f78ecf3b FIX #10460 compatibility with MariaDB 10.4 2019-02-03 20:02:05 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
1b8a873987
Merge pull request #10434 from frederic34/patch-17 
The variable $i does not seem to be defined for all execution paths
 2019-01-30 16:49:16 +01:00
Frédéric FRANCE
26dea99375
Update box_task.php 2019-01-28 00:07:38 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
16496218d3 css 2018-12-18 13:21:00 +01:00
Laurent Destailleur
30af82978b
Merge pull request #10189 from aljawaid/aljawaid-rss_new_tab 
NEW: Ensure External RSS Links Open in New Window
 2018-12-15 16:00:31 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
IJ
d46e84fb21
NEW: Ensure External RSS Links Open in New Window 
- This ensures that the user does not move away from the Dolibarr page
 2018-12-06 12:57:03 +00:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
BENKE Charlene
c34b213f61
scrutinizer major error 2018-12-01 11:33:58 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Frédéric FRANCE
9b3fc6527c
Update box_graph_product_distribution.php 2018-10-28 23:50:13 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
868caa4991 Missing ref_customer in popup 2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb Fix thirdparty popup 2018-10-21 12:03:22 +02:00
Laurent Destailleur
fa99ea1f0f Fix thirdparty popup 2018-10-21 11:55:25 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
b73a2a24ef FIX Tooltip on invoice widget 2018-10-10 01:16:53 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
 2018-09-18 11:49:35 +02:00
Laurent Destailleur
3fc3cc4688 Fix missing email in popup 2018-09-17 14:17:10 +02:00
Laurent Destailleur
de8496773d
Merge pull request #9441 from grandoc/new_branch_09_09_2018 
New branch 09 09 2018
 2018-09-12 18:24:34 +02:00
Philippe GRAND
b4cbb0561d Standardize and update code 2018-09-11 10:36:39 +02:00
Philippe GRAND
b40fe8e4c9 Standardize and update code 2018-09-09 12:07:14 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
0300991389 Fix trans 2018-08-27 23:42:47 +02:00
Laurent Destailleur
90c3f8afce Fix trans 2018-08-27 23:39:11 +02:00
Laurent Destailleur
d2154e72c0 Fix trans 2018-08-27 23:23:49 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
ff6ffa4738 Fix data in tooltip 2018-06-27 00:38:42 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
fc167612c2 NEW class reposition can also work on POST (not only GET) 2018-04-19 13:59:20 +02:00
Laurent Destailleur
1e0a660d24 More font awesome picto instead of img 2018-04-16 19:57:46 +02:00
Laurent Destailleur
768b9d3d1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 10:01:45 +02:00
Laurent Destailleur
891925874f FIX #8574 2018-04-13 00:54:08 +02:00
Laurent Destailleur
22210446da
Merge pull request #8407 from joseplluis/develop 
FIX: add contact permission on contact box
 2018-03-18 12:19:09 +01:00
Josep Lluís
b2a4e3d023
Error in fix 2018-03-18 08:20:43 +01:00
Josep Lluís
bd81487f71
FIX: add contact permission on contact box 
In contact box is only checked the "societe" permission.
Contact permission should be checked too.
 2018-03-17 19:35:34 +01:00
Laurent Destailleur
e6dd312bd5 Debug ticket module 2018-03-13 13:56:45 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
6338328c90 Fix scrutinizer errors 2018-03-04 11:09:53 +01:00
Laurent Destailleur
f36308fa0a FIX nohover broken on boxes 2018-03-01 17:20:37 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
d6317a26d2 Fix for multicompany 2018-01-30 15:48:09 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
3b10f826f9 Css 2017-12-14 17:37:32 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
46b281f703 Fix for #7697 2017-12-01 19:29:29 +01:00
Laurent Destailleur
807bfbb696
Merge pull request #7867 from frederic34/bank 
info bank
 2017-11-27 14:50:00 +01:00
Laurent Destailleur
b142ac1c06 CSS 2017-11-26 22:12:11 +01:00
Frédéric FRANCE
6a91b16995
info bank 2017-11-25 12:13:03 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Laurent Destailleur
bf0017ffaf Fix column 2017-11-11 00:30:16 +01:00
Laurent Destailleur
b8cbb84e7c Clean code 2017-11-11 00:28:00 +01:00
Laurent Destailleur
26b01792b2 Code comment 2017-11-02 17:58:46 +01:00
Laurent Destailleur
a1f862eba6 NEW Enhance framework so we can use html/icons into SELECT options. 2017-10-26 20:06:23 +02:00
Laurent Destailleur
34d933af29 Default value for graph widget show all graphs 2017-10-20 00:27:52 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Inovea Conseil
d3d6fca350 Missing space in request 
Fix bug in request
 2017-09-25 10:49:56 +02:00
Laurent Destailleur
35d00fd2ec Fix wrap on lites_total 2017-09-23 09:28:31 +02:00
Laurent Destailleur
a94f2b07e1 Fix css 2017-09-23 02:46:33 +02:00
Laurent Destailleur
eaee8ee586 Fix box activity again 2017-09-17 21:30:27 +02:00
Laurent Destailleur
f76b675e09 Fix box activity again 2017-09-17 21:30:15 +02:00
Laurent Destailleur
99149b5cfe Fix box activity again 2017-09-17 21:30:11 +02:00
Laurent Destailleur
90ab6a1f30 Fix box activity again 2017-09-17 21:29:25 +02:00
Laurent Destailleur
f4b8489bd6 Fix box activity again 2017-09-17 21:24:30 +02:00
Laurent Destailleur
0ed5b329a7 Fix box activity again 2017-09-17 21:21:12 +02:00
Laurent Destailleur
94368accc1 Fix activity box 2017-09-17 20:37:18 +02:00
Laurent Destailleur
fb15b2aab0 Fix activity box 2017-09-17 20:36:45 +02:00
Laurent Destailleur
ee774f1bf9 FIX Calculation in the activity box 2017-09-17 20:20:48 +02:00
Laurent Destailleur
9dbd88f0ba FIX Calculation in the activity box 2017-09-17 20:17:51 +02:00
Laurent Destailleur
ccb5344d32 Fix links 2017-08-23 18:52:03 +02:00
Laurent Destailleur
7ba5cf5958 Debug view of services lines 2017-07-31 13:48:00 +02:00
Laurent Destailleur
f9442c1092 Fix box activity 2017-07-28 11:11:20 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Laurent Destailleur
c7a6a67e20 Fix remove warnings 2017-06-22 11:04:29 +02:00