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

108088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
8f3335f75d CSS 2022-04-11 21:17:35 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
6005f0e08b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-11 20:57:27 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 20:57:16 +02:00
Laurent Destailleur
155dfbda94 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-11 20:43:50 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/user/card.php
 2022-04-11 20:43:20 +02:00
Laurent Destailleur
c035ee6f2a Look and feel v16 2022-04-11 19:21:04 +02:00
Laurent Destailleur
8b7e790130 Merge pull request #19677 from Hystepik/develop#1 
NEW : Import with select boxes
 2022-04-11 17:35:23 +02:00
Laurent Destailleur
770a0fbe8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-11 17:34:40 +02:00
Laurent Destailleur
480fda43c5 Clean code 2022-04-11 17:34:19 +02:00
Laurent Destailleur
139c5a4327 Merge pull request #19518 from 1ocate/1ocateAddShipmentclose 
NEW Mass action close shipment
 2022-04-11 16:49:34 +02:00
Laurent Destailleur
af5444dc91 FIX ref not set in message of closing shipment 2022-04-11 16:48:56 +02:00
Laurent Destailleur
7028e82cf7 Merge pull request #20551 from Easya-Solutions/new-common-generate-document-show-errors 
NEW display errors in a message box after generating documents
 2022-04-11 16:33:58 +02:00
Laurent Destailleur
7ccbd34c2d Merge pull request #20587 from marc-dll/13.0_FIX_holiday_mails_in_html 
FIX: holiday/leave requests: write status change emails in HTML
 2022-04-11 16:29:13 +02:00
Laurent Destailleur
8b6ad766d6 Merge pull request #20605 from Easya-Solutions/14.0_fix-replenish-stock-by-warehouse 
FIX replenish and manage product stock by warhouse
 2022-04-11 16:23:52 +02:00
Laurent Destailleur
dd6238cb2d Try to save on fetch 2022-04-11 15:24:39 +02:00
Laurent Destailleur
751b9efcd9 Merge pull request #20600 from javierybar/develop 
FIX Tax 2 is lost when order is invoiced
 2022-04-11 15:22:28 +02:00
lvessiller
18488cf1dd FIX replenish and manage product stock by warhouse 2022-04-11 13:53:35 +02:00
Laurent Destailleur
9386a0503e Fix update note 2022-04-11 02:09:24 +02:00
Laurent Destailleur
40720fad25 Fix php8 compatibility 2022-04-11 02:01:32 +02:00
javierybar
d7da57960f FIX Tax 2 is lost when order is invoiced 2022-04-10 15:33:35 +02:00
Laurent Destailleur
857048c9bd Rename file to avoid false alert due to fucking composer that brings 
tons of useless libraries with vulnerabilities.
 2022-04-09 15:56:01 +02:00
Laurent Destailleur
71516ecd3e Clean package.json to avoid false alert of security (not used) 
Conflicts:
	package.json
 2022-04-09 15:50:26 +02:00
Laurent Destailleur
4ff1c4467c Clean package.json to avoid false alert of security (not used) 2022-04-09 15:48:25 +02:00
Laurent Destailleur
da0fcb556f Fix css 2022-04-09 15:28:01 +02:00
Laurent Destailleur
1aecff854b Fix missing limit in redirect 2022-04-09 14:40:29 +02:00
Laurent Destailleur
631d2da6b3 Fix php8 2022-04-09 03:26:38 +02:00
Laurent Destailleur
c65b7fd2ff Fix regression php8 2022-04-09 02:51:40 +02:00
Laurent Destailleur
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +02:00
Laurent Destailleur
fef8a3c141 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-09 02:22:54 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
42f82486da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:59:19 +02:00
Laurent Destailleur
b8c8d2af93 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:56:42 +02:00
Laurent Destailleur
0cdc146f5b FIX add tools to fix bad bank amount in accounting with multicurrency 2022-04-09 00:55:40 +02:00
Laurent Destailleur
eecbc05bc3 Show amount into popup of payment 2022-04-09 00:06:02 +02:00
Laurent Destailleur
003bcd60fa FIX Add protection on bad input of payment on multicurrency invoices 2022-04-08 19:52:40 +02:00
Laurent Destailleur
0673a4826a FIX currency visible into tooltip 2022-04-08 17:13:41 +02:00
Laurent Destailleur
4ff8969bac Merge pull request #19393 from atm-gauthier/NEW/addline_with_position_choice_develop 
New/addline with position choice develop
 2022-04-08 16:09:44 +02:00
Laurent Destailleur
099e7aaeb5 Merge pull request #20532 from OPEN-DSI/fix_add_line_when_create_invoice 
FIX - Fix the adding of lines in the create invoice functions
 2022-04-08 15:33:35 +02:00
Laurent Destailleur
0e3ed3bec9 Merge pull request #20564 from atm-kevin/NEW_Reverse_Movement_Product_Consumption 
NEW : Reverse movement product consumption
 2022-04-08 15:29:34 +02:00
Laurent Destailleur
6579e63622 Merge pull request #20594 from frederic34/patch-1 
Update objectonoff.php
 2022-04-08 15:20:17 +02:00
Laurent Destailleur
bedb08df50 Clean and debug online payment code 2022-04-08 15:15:55 +02:00
Frédéric FRANCE
284649fd4b Update objectonoff.php 2022-04-08 13:35:21 +02:00
Laurent Destailleur
6169f76a34 Add log for debug. Make new method for stripe payment an option. 2022-04-08 12:38:49 +02:00
Laurent Destailleur
1d879bc996 FIX numbering method when mask include {cccc} 2022-04-08 10:19:20 +02:00
kevin
6a8e3761c3 Resolve merge conflicts 2022-04-08 09:54:17 +02:00
kevin
68e60fe628 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Reverse_Movement_Product_Consumption 2022-04-08 09:51:41 +02:00
kevin
135e4f1768 Add tooltip to explain the trash action 2022-04-08 09:50:40 +02:00
Laurent Destailleur
5ea42825fb Merge pull request #19362 from ptibogxiv/patch-451 
NEW stripe element with more gateways
 2022-04-08 09:45:22 +02:00