Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
94,530 Commits 36 Branches 189 Tags
a2d451dbfbf63e2eb843e152d40bf82e9fdb7f4a
Commit Graph

94530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a2d451dbfb Missing extrafield on report 2021-06-24 12:17:32 +02:00
Laurent Destailleur
6db44e66d6 FIX #18006 2021-06-23 13:30:00 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Laurent Destailleur
c9d4ccd40a Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block 
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
 2021-06-23 10:48:22 +02:00
Laurent Destailleur
9c657206b3 Update linkedobjectblock.tpl.php 2021-06-23 10:47:51 +02:00
Laurent Destailleur
56212508e7 Update linkedobjectblock.tpl.php 2021-06-23 10:47:23 +02:00
Laurent Destailleur
ac8564dc34 Fix disable token renewal on .css.php, .js.php and .json.php 2021-06-21 13:06:40 +02:00
Laurent Destailleur
de57769d92 Merge pull request #17995 from aspangaro/12_p6 
FIX Accoutancy Limit date payment not register on purchases operations
 2021-06-21 11:41:10 +02:00
Laurent Destailleur
0dc16b135d FIX allow disabling of a module (not dangerous) even if pb with token. 2021-06-21 00:05:01 +02:00
Alexandre SPANGARO
c8326c1365 FIX Accoutancy Limit date payment not register on purchases operations 2021-06-20 21:55:48 +02:00
Laurent Destailleur
5d6b26ddb7 Fix css 2021-06-19 19:45:13 +02:00
Laurent Destailleur
77ee317f8a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-19 19:24:46 +02:00
Laurent Destailleur
bbb2cdfbdf Prepare 13.0.4 2021-06-19 19:24:32 +02:00
Laurent Destailleur
8eaecc253b Merge pull request #17981 from dpriskorn/patch-11 
Update README.md
 2021-06-19 14:32:32 +02:00
Laurent Destailleur
b3d44ab332 Merge pull request #17976 from frederic34/patch-7 
fix typo can't set mandatory
 2021-06-19 14:14:24 +02:00
Laurent Destailleur
ad30e8efc0 Fix phpcs 13.0.3 2021-06-19 00:47:57 +02:00
Dennis Priskorn
3ef203500a Update README.md 
Add precise PHP min and max versions
 2021-06-18 22:35:16 +02:00
Frédéric FRANCE
9b4a8aca1b fix typo can't set mandatory 2021-06-18 11:00:00 +02:00
Laurent Destailleur
2dba09356b Disable nightly for v13 2021-06-18 10:45:53 +02:00
Laurent Destailleur
53295a0cb1 Fix phpcs 2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795 Fix PHPCS 2021-06-18 00:59:18 +02:00
Laurent Destailleur
10dadb2247 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-17 22:02:29 +02:00
Laurent Destailleur
51eaecdc6b Fix phpcs 2021-06-17 22:02:06 +02:00
Laurent Destailleur
62cbea6bca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-17 21:35:42 +02:00
Laurent Destailleur
5063f29532 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/class/mailing.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/replenish.php
 2021-06-17 21:35:31 +02:00
Laurent Destailleur
98a0959b64 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-17 21:31:00 +02:00
Laurent Destailleur
e4056b8a1d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-17 21:30:50 +02:00
Laurent Destailleur
ce9dbfccd7 Merge pull request #17953 from atm-gauthier/fix_trackingnumber_line_not_displaied_if_empty 
FIX : Tracking number label shouldn't be displaied on "espadon" model…
 2021-06-17 13:36:42 +02:00
Laurent Destailleur
96da2a6a37 Merge pull request #17962 from atm-lena/12.0_FIX_AddTrigger_MailingDelete 
12.0 fix add trigger mailing delete
 2021-06-17 13:35:01 +02:00
Gauthier PC portable 024
50bc832532 FIX : better correction 2021-06-17 10:48:48 +02:00
atm-lena
9769e33eab notigger parameter 2021-06-17 10:41:55 +02:00
atm-lena
5b8a6f1d71 Add Trigger "MAILING_DELETE" 2021-06-17 10:41:03 +02:00
Juanjo Menent
eeef78760a fix: Bad position of the printFieldListWhere hook 2021-06-17 10:29:43 +02:00
Juanjo Menent
99655eeb39 FIX: styles failure in tickets with very long messages 2021-06-17 09:28:45 +02:00
Laurent Destailleur
3b42b44899 Update travis 2021-06-16 19:05:51 +02:00
Gauthier PC portable 024
657972b79b FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty 2021-06-16 16:49:24 +02:00
Laurent Destailleur
e503f73e95 Comment dead code 2021-06-15 22:28:39 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Laurent Destailleur
1aad151e19 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-15 22:08:50 +02:00
Laurent Destailleur
dea8c8d32f Merge pull request #17938 from atm-kevin/FIX_13.0_Ticket_Card 
Fix : Fatal error on ticket presend
 2021-06-15 22:08:03 +02:00
stickler-ci
26cae49faf Fixing style errors. 2021-06-15 20:06:48 +00:00
Laurent Destailleur
5ddf12b29c Fix set language 2021-06-15 22:06:26 +02:00
Laurent Destailleur
78f41bf60e Update card.php 2021-06-15 22:04:31 +02:00
kevin
9ff0efbcc2 FIX fatal error when adding message to a ticket 2021-06-15 12:04:24 +02:00
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02 Add info to allow debug of email collector 2021-06-14 19:58:12 +02:00
stickler-ci
745ad8b403 Fixing style errors. 2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347 FIX : same thing on supplier orders 2021-06-14 17:01:59 +02:00
Laurent Destailleur
d6d419783e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	doc/install/README-DE
	doc/install/README-FR
 2021-06-14 15:26:41 +02:00