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

557 Commits

Author SHA1 Message Date
florian HENRY
71afaaa360 fix : availibity refresh 2017-06-12 17:24:36 +02:00
Laurent Destailleur
b81de35703 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/contrat/class/contrat.class.php
 2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e Fix escaping class 2017-05-12 15:28:10 +02:00
Laurent Dinclaux
a1e9246794 Resolved merge conflict [2] 2017-05-05 10:34:38 +11:00
Laurent Dinclaux
24a2fb57ea Resolved merge conflict 2017-05-05 10:22:46 +11:00
Laurent Destailleur
8318ebc109 Fix missing field into addline of proposals 2017-05-04 10:45:20 +02:00
David
270c3db32e fix params order for tha addline() function 
please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
 2017-05-04 10:16:36 +02:00
Laurent Dinclaux
f63f28c7fe Fix vat_src_code propagation between post types 2017-05-03 21:37:30 +11:00
Laurent Dinclaux
98b2e83bfb Fix localtaxes type not retrieved in proposals. Fixes Dolibarr/dolibarr/#6786 2017-05-03 21:36:56 +11:00
Laurent Destailleur
3917bdfc79 Fix vat_src_code propagation. 2017-05-02 22:37:43 +02:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if 
there is several vat line with same rate.
 2017-03-04 22:27:44 +01:00
Laurent Destailleur
e981e719a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/comm/action/card.php
 2017-02-23 02:54:40 +01:00
fmarcet
c175dfe68b Fix: Bad code makes don't work for external modules numeration model 2017-02-15 09:47:18 +01:00
fmarcet
e903bf2b5c Fix: Bad code makes don't work for external modules numeration model 2017-02-14 18:55:39 +01:00
Laurent Destailleur
40737eac2e FIX #6361 2017-02-02 02:49:04 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Maxime Kohlhaas
d426ab04f0 Multicurrency on proposal and order 2016-12-11 00:42:52 +01:00
florian HENRY
9e8991f7fa FIX : Bug when updateing availability and demand reason because $user 
is not passed to trigger.
 2016-12-10 12:21:48 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
0ff21f0bee Fix example 2016-12-05 12:04:22 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
 2016-12-03 16:01:18 +01:00
arnaud
c17d354367 Fix propal updateline oldcopy extrafields 2016-11-30 16:48:27 +01:00
Laurent Destailleur
2043c279b0 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:47:40 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
gauthier
8e7c0fa353 FIX : wrong var name 2016-11-17 14:21:19 +01:00
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php
 2016-11-11 15:03:05 +01:00
Marcos García de La Fuente
c6f96a81d1 Little correction 2016-11-09 11:30:55 +01:00
Marcos García de La Fuente
0b594eab59 FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them 2016-11-09 11:28:05 +01:00
Laurent Destailleur
e9edbba093 NEW Usage of vat code seems ok everywhere. 2016-10-29 21:02:08 +02:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
florian HENRY
38fa0bed4b FIX delete line with no triggers 2016-10-07 15:30:35 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
6f26a7390e FIX #5752 Bug VAT NPR not propagated during proposal cloning 2016-10-01 18:33:37 +02:00
Laurent Destailleur
03c60f1b7d FIX #5802 Incoterms not set 2016-10-01 13:55:07 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
35dd492d19 NEW Add REST api for commercial proposals 2016-09-22 12:53:44 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
dd7c7b9d4b Merge pull request #5467 from atm-florian/add_update_trigger 
NEW : review Propal/Order/Invoice class to be uniformize on triggers calls
 2016-07-14 23:00:11 +02:00
florian HENRY
10b0e5dd57 clean trigger and normalize code 2016-07-08 21:28:21 +02:00
florian HENRY
195d6187a3 NEW : Uniformize code and correct deal with triggers 2016-07-08 20:40:25 +02:00
philippe grand
bc5b9bd8a2 internationalization of code comment 2016-07-08 18:24:55 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b Fix: error message was not enough to understand 2016-06-24 17:04:59 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00