Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,848 Commits 35 Branches 179 Tags 1.7 GiB
f8b0e535fa
Commit Graph

778 Commits

Author SHA1 Message Date
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Philippe GRAND
f450e04856 Merge remote-tracking branch 'upstream/8.0' into 8.0 2018-10-26 15:38:15 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
b73a2a24ef FIX Tooltip on invoice widget 2018-10-10 01:16:53 +02:00
Laurent Destailleur
13759ea146 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2018-10-04 17:53:40 +02:00
aplose
8ee7a48583 Fix issue #9434 : no array_options available when calling api : 
I replace the deprecated code by the fetch_optionnals() recommanded call.
 2018-10-03 15:15:46 +02:00
Laurent Destailleur
e3b1cb9fdb
Update facture.class.php 2018-09-27 09:25:37 +02:00
John BOTELLA
791c373db5 FIX credit note progression 2018-09-25 09:54:58 +02:00
John BOTELLA
b1380a6902 FIX situation invoice total with credit note 2018-09-24 16:12:00 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
Philippe GRAND
9025fd5891 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2018-09-06 14:33:46 +02:00
Philippe GRAND
844333688b typo 2018-09-06 14:33:22 +02:00
Laurent Destailleur
db6f80e2ff FIX invoice popup hide localtax2 and 3 if not defined 2018-09-04 00:42:15 +02:00
Laurent Destailleur
3d50c454c1 Code comment 2018-09-03 17:05:44 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
Regis Houssin
26495fb698 Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!! 2018-07-01 18:49:37 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost 
when clculating total_ht_devise
 2018-06-13 16:35:52 +02:00
Laurent Destailleur
7c0afbe025 Clean code 2018-05-31 17:12:08 +02:00
Laurent Destailleur
3f489ee3c6 Fix look and feel v7 for popup on ref of social contributions payments 2018-05-27 17:58:32 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Inovea Conseil
5804d1d4a3
Fix missing params for commonGenerateDocument 
ADD param moreparams for compatibility with commonGenerateDocument
 2018-05-17 10:16:44 +02:00
John
c67ab2a758 add hidden conf 2018-05-16 16:14:49 +02:00
John
b01893d536 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull 2018-05-16 15:29:57 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
c81c744aaf Clean deprecated var 2018-04-21 13:14:58 +02:00
Laurent Destailleur
1031fcd796 logs 2018-04-21 00:37:05 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
TuxGasy
47dcc0d5c6 fix notrigger ignored on BILL_CREATE 2018-04-05 18:32:41 +02:00
Laurent Destailleur
9892a97424
Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE 
fix notrigger ignored on BILL_CREATE
 2018-04-05 18:27:45 +02:00
John
e966d11356 Fix credit note card apparence 2018-04-05 09:46:55 +02:00
TuxGasy
e5664f9630 fix notrigger ignored on BILL_CREATE 2018-04-04 20:32:36 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
John
b4983d0e6d FIX invoice filter 2018-03-22 11:37:16 +01:00
John
f91fe41f45 prepare invoice selection and calculation 2018-03-19 15:50:56 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
390618db47 Fix bad space 2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762 Fix phpcs 2018-03-10 22:41:57 +01:00