lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,110 Commits 43 Branches 150 Tags 886 MiB
bbb751dc53
Commit Graph

5224 Commits

Author SHA1 Message Date
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
ac965bf49a FIX #16551 2021-06-11 17:40:04 +02:00
Laurent Destailleur
77efbda148 Fix responsive 2021-06-10 20:04:21 +02:00
Laurent Destailleur
f3b6c8bf17
Merge pull request #17876 from AlexisLaurier/bugfix/supplierBankTransfertWrongCodeCheckMassAction 
bugfix/supplierBankTransfertWrongCodeCheckMassAction
 2021-06-10 16:44:32 +02:00
Alexis LAURIER
03cd88d145 bugfix/supplierBankTransfertWrongCodeCheckMassAction 2021-06-10 16:29:56 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +02:00
Laurent Destailleur
c00bef83a8 Fix php unit 2021-06-09 18:05:56 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Frédéric FRANCE
4e530c2486
Update card.php 2021-06-08 12:05:45 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks 
New Hooks to rename Supplier Orders statuses
 2021-06-05 02:11:29 +02:00
Laurent Destailleur
f0118183c8 Clean code 2021-06-05 01:11:05 +02:00
Laurent Destailleur
6ae4a75ac2
Update fournisseur.commande.class.php 2021-06-05 01:04:09 +02:00
Francis Appels
01f5a5fb18 Fix update receipt eatby 2021-06-04 12:38:04 +02:00
Laurent Destailleur
8d5c419f92
Merge pull request #17744 from fappels/14_fix_trigger_delete_dispatch 
Fix dispatch receipt edit and delete
 2021-06-04 12:37:05 +02:00
Laurent Destailleur
82757f0989
Merge pull request #17775 from dolibit-ut/patch-337 
Update list.php
 2021-06-04 10:35:51 +02:00
Laurent Destailleur
3a201fa017
Merge pull request #17776 from dolibit-ut/patch-338 
Update card.php
 2021-06-04 10:35:28 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339 
Update card.php
 2021-06-04 10:35:11 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note 
ADD note to supplier order refusal
 2021-06-04 10:10:17 +02:00
Laurent Destailleur
c7e21daee7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 09:36:20 +02:00
Laurent Destailleur
621aa9e6f3 Fix typo 2021-06-04 09:27:33 +02:00
Laurent Destailleur
3ae3137eaf Missing picto 2021-06-04 08:57:48 +02:00
Laurent Destailleur
350a421544
Update card.php 2021-06-04 08:41:26 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
Christian Foellmann
55d48077a3 ADD note to supplier order refusal 2021-05-31 10:45:34 +02:00
UT from dolibit
7aae5be54a
Update card.php 2021-05-31 10:36:43 +02:00
UT from dolibit
fed7878d18
Update card.php 
$lineid  was duplicate
 2021-05-31 10:33:36 +02:00
UT from dolibit
a97efdbdfa
Update list.php 
$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
 2021-05-31 10:31:25 +02:00
Francis Appels
48f5cea917 Fix update receipt eatby 2021-05-27 16:03:17 +02:00
Francis Appels
8ed24d6796 Add missing trigger LINERECEPTION_DELETE 2021-05-27 16:02:12 +02:00
Frédéric FRANCE
1662d4a829
fix warnings 2021-05-25 23:14:36 +02:00
Laurent Destailleur
8f9de222c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-25 21:53:56 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier 
NEW translate supplier order menus and button
 2021-05-25 20:34:17 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
fb6aea72b8 Fix syntax error 2021-05-25 12:06:29 +02:00
lvessiller
38bd595ebd NEW translate supplier order menus and button 2021-05-21 14:18:46 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1 
FIX wrong variable fk_code_ventilation register for addline
 2021-05-20 14:31:52 +02:00
Laurent Destailleur
217ee260c2 css 2021-05-19 15:11:47 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
Alexandre SPANGARO
f86e10b453 FIX wrong variable fk_code_ventilation register for addline 2021-05-19 06:37:02 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Antonin MARCHAL
779c868eae fix mistake and removed hookmanager unused 2021-05-17 13:48:21 +02:00
Antonin MARCHAL
c6aa078892 renamed LibStatut hook + removed useless hook 2021-05-17 13:46:01 +02:00
Laurent Destailleur
4e5a3a22c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995 Add missing property 2021-05-17 13:36:27 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00