lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97,383 Commits 43 Branches 150 Tags 886 MiB
904dca335a
Commit Graph

909 Commits

Author SHA1 Message Date
Alexandre SPANGARO
ddea3f8a92 Code enhanced - Standardize field name #14697 2021-02-21 21:47:26 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20 2021-02-21 20:28:06 +01:00
Frédéric FRANCE
997dee67af
fix propal box 2021-02-20 17:42:51 +01:00
Alexandre SPANGARO
3dcfe40e71 Code enhanced - Standardize field name #14697 2021-02-20 08:00:27 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
5966e63120 Fix css 2021-02-08 20:01:10 +01:00
Laurent Destailleur
925d81d1b3
Merge pull request #16002 from Hystepik/develop#1 
New update of funnel of prospection
 2021-02-08 18:05:48 +01:00
Frédéric FRANCE
dbe5c23ed5
Update box_produits_alerte_stock.php 2021-02-07 19:45:18 +01:00
Frédéric FRANCE
58a39a263b
Update box_produits.php 2021-02-07 19:44:09 +01:00
Frédéric FRANCE
ebe7e1464a
fix html 2021-02-07 19:38:46 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
1fd2f12673 Fix responsive 2021-02-02 11:16:25 +01:00
Laurent Destailleur
3b9bd3cc40 Fix responsive 2021-02-02 11:15:16 +01:00
Laurent Destailleur
218a76ee63 FIX SQL Error with postgres or mysql strict mode 2021-02-02 11:06:58 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Frédéric FRANCE
22522f5aa2
fix include 2021-01-25 17:06:25 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-19 11:36:59 +01:00
lmarcouiller
afab5a977a dolgrap.class.php with frederic34 advices 2 2021-01-19 09:43:06 +01:00
lmarcouiller
fd888be5e5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-01-19 09:05:08 +01:00
Laurent Destailleur
f95bf56c15 Fix translation 2021-01-18 15:24:50 +01:00
lmarcouiller
383281e5f3 New update of funnel of prospection 2021-01-18 11:32:02 +01:00
Frédéric FRANCE
83b7e3c678
fix unknown variable 2021-01-18 08:01:18 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 21:06:12 +01:00
Laurent Destailleur
a4109d3fd0
Merge pull request #15600 from Hystepik/develop#2 
Close #15384 : New widget stat database
 2021-01-16 18:42:50 +01:00
Frédéric FRANCE
216da52972
Merge remote-tracking branch 'upstream/develop' into patch-8 2021-01-16 14:00:05 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 13:58:27 +01:00
Laurent Destailleur
c7c74e8ed1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-01-15 19:53:46 +01:00
Laurent Destailleur
ea266c1f2d Fix missing alias 2021-01-15 17:59:08 +01:00
Frédéric FRANCE
225c68d5e6
Update box_members.php 2021-01-13 22:00:40 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2 2021-01-13 17:40:21 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Laurent Destailleur
b3461161ec Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH 2021-01-09 02:28:50 +01:00
Laurent Destailleur
2794327e10 Update box_birthdays.php 2021-01-07 12:50:14 +01:00
Lars Wallenborn
1880e51d1c [FIX] sort order in birthday box 
The current sort order is by date and not by day of month. This yields
the following unexpected results:

Given

* Person A, born on 1980-01-10
* Person B, born on 1970-01-30

I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
 2021-01-07 12:50:07 +01:00
Laurent Destailleur
a498f8dfe1 Fix sort by day 2021-01-07 12:49:54 +01:00
Laurent Destailleur
094ea841db Fix sort by day 2021-01-07 12:49:19 +01:00
Laurent Destailleur
ddc3f35be1
Update box_birthdays.php 2021-01-07 12:47:16 +01:00
Lars Wallenborn
f578164b42 [FIX] sort order in birthday box 
The current sort order is by date and not by day of month. This yields
the following unexpected results:

Given

* Person A, born on 1980-01-10
* Person B, born on 1970-01-30

I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
 2021-01-07 11:43:11 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-06 21:05:59 +01:00
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
Laurent Destailleur
17306bc715 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_shipments.php
 2021-01-06 20:12:09 +01:00
Laurent Destailleur
7372a18283
Update box_shipments.php 2021-01-06 19:56:49 +01:00
ATM john
50b5226d10 FIX #15465 External user sees last 5 shipments to other customers in the dashboard 2021-01-06 12:40:38 +01:00
Regis Houssin
f80a476bc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-06 11:37:56 +01:00
lmarcouiller
6aa2241617 Merge remote-tracking branch 'doligithub/develop' into develop#2 2021-01-05 18:07:34 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
40645ea24d Fix load lang 2021-01-05 10:39:53 +01:00
Frédéric FRANCE
7291bf34f0
boxes 2021-01-02 22:29:23 +01:00
Frédéric FRANCE
dc6c1b8d3b
boxes 2021-01-02 22:12:19 +01:00
Frédéric FRANCE
bd762bc58f
boxes 2021-01-02 21:50:58 +01:00
Frédéric FRANCE
8f3e6df3e1
transform into box 2021-01-02 21:03:04 +01:00
Regis Houssin
7c5248d105 FIX and the world turn again 2020-12-30 11:27:03 +01:00
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Laurent Destailleur
057945f693 Fix bad var 2020-12-29 17:04:39 +01:00
Regis Houssin
6e0832fb38 FIX WIP avoid warning with php 8.0 2020-12-29 15:59:39 +01:00
Frédéric FRANCE
08bad6fc30
remove warnings 2020-12-28 20:54:29 +01:00
Laurent Destailleur
a0440fbe88 Removed warnings 2020-12-24 03:06:52 +01:00
Laurent Destailleur
4bc0b46556 css 2020-12-21 17:33:57 +01:00
Laurent Destailleur
6937ab75fa Fix test 2020-12-21 02:31:19 +01:00
Laurent Destailleur
0a19f3cf5b css 2020-12-21 02:27:05 +01:00
Laurent Destailleur
5dc6f5b89f Prepare 13.0 2020-12-21 01:33:06 +01:00
Laurent Destailleur
812fd22629
Merge branch 'develop' into develop#2 2020-12-15 14:09:29 +01:00
Laurent Destailleur
1624b8636f Show timeone 2020-12-15 10:43:19 +01:00
Laurent Destailleur
d3ba87b09a Better gantt 2020-12-15 02:32:56 +01:00
Laurent Destailleur
2d343ab016 Fix 2020-12-14 20:01:17 +01:00
Laurent Destailleur
9595504b56 Fix graph 2020-12-14 19:57:59 +01:00
Laurent Destailleur
b452852b30 Fix phpcs 2020-12-12 16:35:30 +01:00
Laurent Destailleur
a3d302d91c Debug v13 2020-12-12 13:58:21 +01:00
Laurent Destailleur
0968c68cf9 Enhance widget 2020-12-12 12:45:43 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
9100e1410e Fix translation, add comments and clean code, fix also a small 
regression on colors for graph with lines
 2020-12-11 17:59:18 +01:00
Laurent Destailleur
91ddcf6446
Merge pull request #15724 from Hystepik/develop#1 
Close #15383 : New format for funnel of prospection
 2020-12-11 16:31:46 +01:00
lmarcouiller
dea75e6158 Close #15729 : fix error on box name and format 2020-12-11 15:55:17 +01:00
lmarcouiller
54228ad256 Close #15729 : fix bug with nb jobs 2020-12-11 15:49:47 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Laurent Destailleur
4ec598d571 Debug v11 2020-12-11 02:12:39 +01:00
Laurent Destailleur
693a7590ef Fix boxes 2020-12-10 17:09:25 +01:00
lmarcouiller
716bb433e8 ajout pictogramme graph dans info box head 2020-12-10 15:50:18 +01:00
stickler-ci
0a2f656137 Fixing style errors. 2020-12-10 12:19:43 +00:00
lmarcouiller
4f6923442a fix merge and sql synthax 2020-12-10 13:19:10 +01:00
Hystepik
a57b01e9ba
Update box_funnel_of_prospection.php 2020-12-10 11:12:33 +01:00
stickler-ci
492715811c Fixing style errors. 2020-12-10 10:10:12 +00:00
Hystepik
14358f022d
Merge branch 'develop' into develop#1 2020-12-10 11:09:42 +01:00
Frédéric FRANCE
a256bfeb46
fix warnings 2020-12-09 17:50:21 +01:00
lmarcouiller
83286d99be funnel horizontal bar 2020-12-09 13:31:14 +01:00
Stephane Lesage
3161f35971 Fix boxes third-parties information 2020-12-08 14:08:32 +01:00
lmarcouiller
401d61dd91 resolve auto import by IDE 2020-12-08 09:05:31 +01:00
Hystepik
3d674abfae
Merge branch 'develop' into develop#2 2020-12-08 09:01:20 +01:00
Laurent Destailleur
f21a4e8aed
Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Hystepik
2ac98d06f5
Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Frédéric FRANCE
325951877b
fix missing fields in box 2020-12-05 08:58:20 +01:00
Frédéric FRANCE
e9a12b5324
fix missing fields in box 2020-12-05 08:56:17 +01:00
Frédéric FRANCE
e3037c7e1a
doxygen 2020-12-03 17:33:22 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
 2020-12-03 11:26:53 +01:00
Laurent Destailleur
af4f473c93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_produits.php
 2020-12-03 11:22:34 +01:00