Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,562 Commits 36 Branches 190 Tags
c5f3f428672bbf27ffb51a410b58c03b664fae14
Commit Graph

1015 Commits

Author SHA1 Message Date
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