Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,088 Commits 36 Branches 190 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

6273 Commits

Author SHA1 Message Date
Laurent Destailleur
49e53abf53 Fix pdf on letter format 2022-03-17 15:01:15 +01:00
lvessiller
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
ee0ffae407 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
 2022-03-17 00:15:01 +01:00
Laurent Destailleur
3346d64416 Merge pull request #20305 from fmarcet/14.0 
Fix: Error whem generating supplier payment pdf
 2022-03-16 22:46:53 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-03-16 20:34:30 +01:00
Laurent Destailleur
319f21ef69 Fix regression 2022-03-16 16:23:27 +01:00
ATM john
4f395a836e fix crabe multidir output 2022-03-16 12:10:10 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +01:00
atm-steve
21090963e0 Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-14 17:03:52 +01:00
steve
1555a95ce8 Activate new rights read and write 2022-03-14 16:50:43 +01:00
Regis Houssin
44b6f8a48d FIX avoid php warning 2022-03-14 09:20:10 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Thomas Negre
6e08115aa2 introduce constant INVOICE_CHECK_POSTERIOR_DATE in Facture module 2022-03-09 09:25:52 +01:00
Laurent Destailleur
2d93c6b678 Fix template 2022-03-08 19:00:21 +01:00
Ferran Marcet
8e944b8b6d Fix: Error whem generating supplier payment pdf 2022-03-08 17:34:51 +01:00
Laurent Destailleur
d6852c31b8 Clean code 2022-03-07 19:31:06 +01:00
Laurent Destailleur
6e298a2cb4 Fix phpunit 2022-03-07 19:18:32 +01:00
Laurent Destailleur
492c198e46 Make conditions of some corn tasks dynamic. 2022-03-07 18:01:07 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94 Merge pull request #20136 from bb2a/Send-Local-Database-Dump 
NEW -  Add util function send backup by mail
 2022-03-07 17:37:44 +01:00
Laurent Destailleur
29e278ed36 Update modCron.class.php 2022-03-07 17:33:50 +01:00
Laurent Destailleur
0020f4e48a Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing 
New - Ticket: notify contacts at closing
 2022-03-07 16:23:27 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
7d374dc4f6 Merge pull request #20264 from fmarcet/15.0 
Fix: #20161 Can't import thirds. Column Skype doesn't exist
 2022-03-07 14:21:42 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Ferran Marcet
8c2c3bf3fb Fix: Can't import thirds. Column Skype doesn't exist 2022-03-04 10:06:24 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Steve
8f07c22d70 Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-02 14:51:46 +01:00
Laurent Destailleur
5ffac5f3ee Fix typo 2022-03-02 11:38:32 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
b79ad197ec FIX Missing the field date start/end in export supplier invoice/order 2022-03-01 17:29:22 +01:00
Steve
5bf186c8ce Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-01 11:42:57 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
67881a7932 Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Thomas Negre
e1e643efba Ticket : add option TICKET_NOTIFY_AT_CLOSING to ticket config panel 2022-02-28 17:10:45 +01:00
steve
91ee90ebeb fix: read employee and write employee 2022-02-28 16:48:08 +01:00
steve
08fa2dfadd wip: add read employee and write employee 2022-02-28 15:58:23 +01:00
Francis Appels
3e41c9cb97 FIX: Show product photo on Supplier order Cornas model. 2022-02-26 11:13:02 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +01:00
BB2A Anthony Berton
d28ba84cb3 Mail sendto default and add filter 2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee sens dump 2022-02-21 15:56:09 +01:00
Thomas Negre
ad3f7b531e add constants declarations in the module class 2022-02-21 11:50:28 +01:00