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
67,255 Commits 35 Branches 179 Tags 1.7 GiB
eaee252a5d
Commit Graph

7965 Commits

Author SHA1 Message Date
Laurent Destailleur
7c0afbe025 Clean code 2018-05-31 17:12:08 +02:00
Laurent Destailleur
d8d4d15b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:13:18 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Laurent Destailleur
3733169120 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/recap-compta.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 11:09:53 +02:00
florian HENRY
b65b545e0f add hook on balence pages 2018-05-29 16:29:14 +02:00
Laurent Destailleur
4d60fb3468 Fix size of popup 2018-05-29 10:57:14 +02:00
Laurent Destailleur
323bf6ef1f
Merge pull request #8873 from frederic34/loadlangs 
loadlangs
 2018-05-29 10:07:10 +02:00
Laurent Destailleur
f83dedf1b0 Fix space/tab 2018-05-29 10:04:20 +02:00
Neil Orley
748be12da2 Get external contacts ids instead of BILLING contacts ids. 2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2018-05-28 09:30:21 +02:00
Laurent Destailleur
5da89e1cad Remove log 2018-05-27 19:33:46 +02:00
Laurent Destailleur
f3f252e88b Fix duplicate record before creating primary key 2018-05-27 19:31:03 +02:00
Frédéric FRANCE
5c8f966898
Merge remote-tracking branch 'upstream/develop' into loadlangs 2018-05-27 18:41:17 +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
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Frédéric FRANCE
84f2b31d46
loadlangs 2018-05-27 09:40:17 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs 2018-05-27 09:27:09 +02:00
Frédéric FRANCE
812b182680
loadlangs 2018-05-26 17:04:23 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs 2018-05-26 16:03:19 +02:00
Frédéric FRANCE
cbed5c8349
loadlangs 2018-05-26 15:41:32 +02:00
Laurent Destailleur
182abfdb5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/societe/card.php
 2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty 
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
 2018-05-25 12:55:02 +02:00
Laurent Destailleur
b25c7e44d3
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice 
FIX : test is_erasable() must be done before call function delete()
 2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4
Update card.php 2018-05-25 11:04:04 +02:00
Laurent Destailleur
205732e240
Merge pull request #8822 from aspangaro/8.0-b27 
Salaries : Move to LoadLangs
 2018-05-25 10:34:36 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
Laurent Destailleur
d072c2eb5d Fix turnover invoiced by vat rate and country. Use fiscal month start. 2018-05-22 23:09:27 +02:00
Neil Orley
15e02c7082 NEW : adds billing contacts ids to REST API returns 
adds billing contacts ids to REST API returns for proposals, orders and invoices
 2018-05-22 11:40:32 +02:00
Laurent Destailleur
745aa4bd73 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 23:38:46 +02:00
Laurent Destailleur
8951c4a7a5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-21 23:36:47 +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
Alexandre SPANGARO
3fd55585b7 Salaries : Move to LoadLangs 2018-05-20 08:00:42 +02:00
gauthier
4c3f9d6d5e FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url 2018-05-18 15:20:16 +02:00
Laurent Destailleur
24281028b7
Merge pull request #8807 from inoveaconseil/patch-2 
Fix missing params for commonGenerateDocument
 2018-05-18 11:43:11 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation 
Add credit note compatibility with situation invoice.
 2018-05-18 11:34:10 +02:00
Laurent Destailleur
e2369dea29 FIX #8722 2018-05-18 11:17:21 +02:00
Laurent Destailleur
dd53f414f8
Merge pull request #8788 from bugness-chl/develop 
Fix #8722 useless sql ORDER BY
 2018-05-18 11:16:08 +02:00
John
3dd11e1eaf Fix discount id 2018-05-18 11:02:04 +02:00
Laurent Destailleur
689ef37d56
Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element 
Add propals lines inport on invoices.
 2018-05-18 08:55:29 +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
8175d90816 change case 2018-05-17 09:01:49 +02:00
Laurent Destailleur
ac97ba9e36 Fix deletion of stripe card 
Solve validation of recurring invoice
 2018-05-16 20:41:01 +02:00
John
fddd3156b1 add hidden conf 2018-05-16 16:15:30 +02:00
John
c67ab2a758 add hidden conf 2018-05-16 16:14:49 +02:00
John
4a0195deee Fix merge mistake 2018-05-16 15:55:56 +02:00