Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
100,555 Commits 36 Branches 189 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

617 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
77efbda148 Fix responsive 2021-06-10 20:04:21 +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
217ee260c2 css 2021-05-19 15:11:47 +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
c645241327 Corrections 2021-04-27 12:11:28 +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
Alexandre SPANGARO
87cc1b2601 Add right supplier_invoice 2021-04-12 07:37:34 +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
stickler-ci
30d26c1e28 Fixing style errors. 2021-04-06 07:20:07 +00:00
Alexandre SPANGARO
82b652df8a NEW: Add deposit on supplier invoice (& somes ajustments) 2021-04-06 09:15:34 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Alexandre SPANGARO
f8703a0691 Translation "Generated documents" 2021-03-16 04:04:33 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Frédéric FRANCE
8a782e1d4a fix missing include 
needed by dol_get_last_hour
 2021-02-27 09:18:03 +01:00
Frédéric FRANCE
ed6d2376f1 code syntax fourn directory 2021-02-25 23:21:30 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Laurent Destailleur
96a213ced7 Fix escaping html 2021-02-17 11:54:34 +01:00
Frédéric FRANCE
0da942210f deprecate non camelCaps functions 2021-02-09 09:55:48 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
3b8b0d59ba Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn 
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
 2021-02-03 20:24:44 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
kamel
506ba822e9 FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql 2021-02-02 11:06:01 +01:00
Laurent Destailleur
b349290cd1 Fix test for date in future 2021-01-31 12:57:54 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
2f69a380be Fix syntax error 2021-01-16 16:06:49 +01:00
Laurent Destailleur
c7c74e8ed1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-01-15 19:53:46 +01:00
Laurent Destailleur
7d37183f21 FIX Pb with VAT code when VAT code contains a number 2021-01-15 19:43:02 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
e2598f5af3 NEW Add check to avoid invoice date in future 2021-01-11 15:34:25 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00