Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-01 22:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 37 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

2043 Commits

Author SHA1 Message Date
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +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
9c657206b3 Update linkedobjectblock.tpl.php 2021-06-23 10:47:51 +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
dd27d38d5e Merge pull request #17869 from aspangaro/14b13 
NEW Add field date from/to in supplier invoice list
 2021-06-14 16:02:50 +02:00
Frédéric FRANCE
4138353d7f fix warnings 2021-06-12 09:11:12 +02:00
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
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
stickler-ci
17bdd0b5bc Fixing style errors. 2021-06-10 04:03:51 +00:00
Alexandre SPANGARO
3d26ad4cf8 NEW Add field date from/to in supplier invoice list 2021-06-10 05:59:29 +02:00
Laurent Destailleur
9afe8e54a7 Fix 2021-06-10 00:41:15 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Frédéric FRANCE
4e530c2486 Update card.php 2021-06-08 12:05:45 +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
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
UT from dolibit
7aae5be54a Update card.php 2021-05-31 10:36:43 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +02:00
Laurent Destailleur
217ee260c2 css 2021-05-19 15:11:47 +02:00
Laurent Destailleur
6bec5d7e3c Update document.php 2021-05-11 19:23:46 +02:00
Laurent Destailleur
70451050ae Update contact.php 2021-05-11 19:22:46 +02:00
Laurent Destailleur
1c477d2131 Update card.php 2021-05-11 19:21:38 +02:00
Frédéric FRANCE
1d38dc11c6 uniformize supplier cards 2021-05-07 21:28:35 +02:00
Laurent Destailleur
e5b49ce0a2 Merge pull request #17448 from LuferGonn/fourn_facture_change_001 
Update fourn/facture/card.php: Change position(ExtraFields)
 2021-05-03 14:12:07 +02:00
Laurent Destailleur
d1f11d2e65 Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
Luis Fernando
6fb256822b Update card.php: Change position(ExtraFields) 2021-04-30 21:07:24 -05:00
stickler-ci
8fda2ba2b4 Fixing style errors. 2021-04-29 13:34:43 +00:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
kamel
4b490d434c Corrections 2021-04-27 18:08:05 +02:00
kamel
80be0c32e4 Corrections 2021-04-27 14:13:59 +02:00
kamel
3a673c9210 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007 2021-04-27 12:29:10 +02:00
kamel
c645241327 Corrections 2021-04-27 12:11:28 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
8d72448f43 Add right supplier_order 2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
87cc1b2601 Add right supplier_invoice 2021-04-12 07:37:34 +02:00
Laurent Destailleur
0ab31a8680 Look and feel v14 2021-04-11 13:30:30 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
6dc10bc87d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-04-07 12:19:39 +02:00
Pierre Payet
d209dbe43e add missing hooks in fourn invoice list 2021-04-07 11:01:51 +02:00
Laurent Destailleur
fcc6431896 Merge pull request #17136 from aspangaro/14a35 
NEW: Add deposit on supplier invoice (& somes ajustments)
 2021-04-07 02:51:32 +02:00
Laurent Destailleur
90b122035f Fix css 2021-04-06 20:28:00 +02:00