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

59855 Commits

Author SHA1 Message Date
Laurent Destailleur
85b8c9f219 FIX Delete of draft invoice 2018-10-29 14:35:42 +01:00
atm-ph
c83e67123d Fix pgsql : operator does not exist: timestamp without time zone ~~ unknown 2018-10-29 11:04:16 +01:00
Laurent Destailleur
04f80f0925 FIX Do not show check box if not applicable 2018-10-29 02:27:51 +01:00
Laurent Destailleur
553e984465 FIX Selection of addmaindocfile is lost on error 2018-10-29 02:14:41 +01:00
Laurent Destailleur
244c7f8dc3 FIX thirdparty property of object not loaded when only one record 2018-10-29 02:14:36 +01:00
Laurent Destailleur
6e3822345c Fix use setup of template for attached files in mass actions 2018-10-29 02:14:31 +01:00
Maxime Kohlhaas
b68b8fe412 Fix changing currency in a doc was recalculating amounts in company currency #9801 2018-10-28 11:02:51 +01:00
Maxime Kohlhaas
46d3bec104 Fix replenish wasn't caring about supplier price min quantity #9561 2018-10-28 10:25:56 +01:00
Maxime Kohlhaas
2fe4763570 Fix default accounting accounts on loan creation #9643 2018-10-28 09:22:55 +01:00
Librethic
fcd687642c
FIX: keep external module element when adding resource 
When adding object from external module as a resource we need to keep @modulename as defined into url rather than use `element` property (which do not contain @modulename).
 2018-10-27 11:46:12 +02:00
Maxime Kohlhaas
4ec80b5136 Fix invoice supplier clone was not getting all lines parameters #9800 2018-10-27 10:53:01 +02:00
Frédéric FRANCE
a30091fd74
Update commande.class.php 2018-10-27 09:51:19 +02:00
Maxime Kohlhaas
abb343d37e Fix missing name alias field in societe import/export #9091 2018-10-27 09:42:08 +02:00
Maxime Kohlhaas
1b054f1b36 Fix invoice creation from contract was invoicing closed services #9087 2018-10-27 09:21:49 +02:00
Laurent Destailleur
d800fe9256 FIX extrafields of taks not visible in creation 2018-10-26 16:21:01 +02:00
De Coninck Laurent
d347cf3a85 set a message 2018-10-26 16:18:27 +02:00
Philippe GRAND
f450e04856 Merge remote-tracking branch 'upstream/8.0' into 8.0 2018-10-26 15:38:15 +02:00
Laurent Destailleur
ed0393dfa8
Merge pull request #9875 from atm-john/Fix_title 
FIX title
 2018-10-26 15:14:44 +02:00
Laurent Destailleur
35421d135a FIX Total of timespent 
Conflicts:
	htdocs/core/js/timesheet.js
 2018-10-26 15:04:02 +02:00
atm-john
8a9b9f1736 Fix title 2018-10-25 21:53:48 +02:00
Marc de Lima Lucio
16c35035c1 FIX: pdf typhon: order reference duplicate 2018-10-25 12:07:40 +02:00
Laurent Destailleur
f44162715e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:31:04 +02:00
Laurent Destailleur
30a2004d53 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:30:54 +02:00
John BOTELLA
fccea99e23 FIX translation in select unit form 2018-10-24 10:23:27 +02:00
gauthier
036f70860e FIX : wrong occurence number of contract on contact card, we must only count externals 2018-10-24 10:17:21 +02:00
Laurent Destailleur
f0dc2df526 Fix code comment 2018-10-24 03:30:06 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
 2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/theme/md/style.css.php
 2018-10-24 02:40:57 +02:00
Laurent Destailleur
4060dd5377
Merge pull request #9826 from frederic34/patch-9 
Update ajax.lib.php
 2018-10-24 02:29:20 +02:00
Laurent Destailleur
52364f0fd9
Merge pull request #9834 from frederic34/patch-19 
missing semicolon in MD style css
 2018-10-24 02:29:02 +02:00
Laurent Destailleur
2ba6f96765
Update style.css.php 2018-10-24 02:27:59 +02:00
Laurent Destailleur
6c3e1f6d26
Merge pull request #9842 from fappels/8.0 
Deprecate class property expeditionbatch before removing it.
 2018-10-24 02:25:02 +02:00
Laurent Destailleur
e39e57c5b9
Update expeditionbatch.class.php 2018-10-24 02:24:47 +02:00
Laurent Destailleur
ddd267f4c3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-24 02:21:53 +02:00
Laurent Destailleur
c8aa884462 Fix search all 2018-10-23 17:16:46 +02:00
Laurent Destailleur
b7d91c30d9 FIX missing symbol for indian rupies 2018-10-23 12:38:12 +02:00
Laurent Destailleur
7bb5e7c31f Fix responsive 2018-10-23 11:52:21 +02:00
Laurent Destailleur
bf46a35a31 Fix size of key for extrafield of type select 2018-10-22 19:05:04 +02:00
ATM-Nicolas
cf28e4e442 FIX : Variable name 2018-10-22 15:19:33 +02:00
fappels
beb906b5f1 Deprecate class property before removing it. 2018-10-21 22:52:53 +02:00
Frédéric FRANCE
83e2951107
Update style.css.php 2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d
Update style.css.php 2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f
Update style.css.php 2018-10-21 09:23:33 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php 2018-10-19 22:52:18 +02:00
De Coninck Laurent
402bbbe839 fix the member e-mail on resign and validation. 
Since the member module is only using the new configuration and the name of the global variabels changed you have a blocking e-mail error when you try to resign or validate a member. In order to fix that I fallback on the previous variable like that it's still working.

[see: #9640]
 2018-10-19 17:23:53 +02:00
Laurent Destailleur
33cd0e84d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5 Fix regression in creating discount 2018-10-19 14:43:10 +02:00
Laurent Destailleur
91745491ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-19 14:27:37 +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
Laurent Destailleur
47abbd3eb2 Fix bad merge 2018-10-19 14:23:36 +02:00
Laurent Destailleur
36ae81c749 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Ferran Marcet
ffde353441 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:01:02 +02:00
Laurent Destailleur
33031450a3
Merge pull request #9747 from atm-maxime/fix_status_tobatch 
Fix missing status_batch var on product lists #9606
 2018-10-16 20:02:56 +02:00
Laurent Destailleur
d56c237d4e
Merge pull request #9756 from atm-maxime/fix_refused_proposal_in_total 
Fix refused proposals were counted in totals in project overview
 2018-10-16 19:46:19 +02:00
Laurent Destailleur
7cd8b36cea
Merge pull request #9755 from atm-greg/fix_massaction_delete_tasks 
FIX modify parenting before task deletion
 2018-10-16 19:45:43 +02:00
Laurent Destailleur
575038d3a3
Merge pull request #9769 from atm-ph/fix_7.0_list_duplicate_extrafield_value 
Fix list from 'Contacts/Addresses' on company may show duplicate valu…
 2018-10-16 19:36:37 +02:00
Laurent Destailleur
605a7896cf
Merge pull request #9744 from atm-maxime/fix_numbering_supplier_credit_note 
Fix numbering of supplier credit notes (issue #9624)
 2018-10-16 19:17:47 +02:00
Laurent Destailleur
08fa0deb24 FIX Bad label on delete button 2018-10-16 18:41:50 +02:00
atm-ph
72dd182b1f Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields 2018-10-16 18:22:43 +02:00
Laurent Destailleur
70366e9d91 Missing translation 2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343 Fix missing es translation string 2018-10-16 03:30:17 +02:00
Maxime Kohlhaas
dfe239bf8d Fix refused proposals were counted in totals in project overview 2018-10-15 16:58:53 +02:00
atm-greg
06477b40a0 modify parenting before task deletion 2018-10-15 12:34:14 +02:00
Laurent Destailleur
2684767b19 Fix pagination 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2018-10-15 11:08:40 +02:00
Laurent Destailleur
e29fb85cec Fix limit 2018-10-15 11:07:16 +02:00
Laurent Destailleur
aa6996e2d0 Fix pagination show two times the same account on balance of accounts 2018-10-15 11:07:07 +02:00
Laurent Destailleur
9afc53ca06 Fix remove step in accountancy if module expense report not used 2018-10-15 11:05:20 +02:00
Laurent Destailleur
47d98ab69d FIX content lost when editing a label with " 2018-10-15 11:05:04 +02:00
Frédéric FRANCE
4d6d3afbea
code comment 2018-10-15 08:39:46 +02:00
Maxime Kohlhaas
af813f8214 Fix missing status_batch var on product lists #9606 2018-10-14 19:55:25 +02:00
Maxime Kohlhaas
c66823d72f Fix numbering of supplier credit notes (issue #9624) 2018-10-14 17:07:38 +02:00
Laurent Destailleur
fabc11191d
Merge pull request #9739 from frederic34/patch-11 
fix size of $head when replacing by hook
 2018-10-14 16:27:14 +02:00
Laurent Destailleur
f9a66a34d0
Merge pull request #9738 from frederic34/patch-9 
fix doc in import.lib.php
 2018-10-14 16:24:47 +02:00
Frédéric FRANCE
787658ac98
reduce complexity of payments.lib.php 2018-10-14 10:56:03 +02:00
Frédéric FRANCE
70a98743e8
Update functions.lib.php 2018-10-14 10:48:06 +02:00
Frédéric FRANCE
1f1a614b47
Update import.lib.php 2018-10-14 10:21:06 +02:00
Laurent Destailleur
e19453450d Fix closing tag 2018-10-13 19:57:34 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2018-10-13 14:29:51 +02:00
Laurent Destailleur
c15505bc13 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-13 14:27:50 +02:00
Laurent Destailleur
76e6968a21
Merge pull request #9730 from atm-ph/fix_7.0_extrafield_date_not_show 
Fix extrafield contact typed as date isn't show in the list from 'con…
 2018-10-13 12:03:07 +02:00
atm-ph
7b17b453bf Fix sort and switch page 2018-10-12 23:29:35 +02:00
atm-ph
23e4cd57f3 Fix warnings PHP7 2018-10-12 23:27:38 +02:00
Frédéric FRANCE
0f8ac57c85
remove var_dump 2018-10-12 22:34:23 +02:00
atm-ph
e2748953c3 Fix print extrafield date in list 2018-10-12 22:31:47 +02:00
Laurent Destailleur
87f744896d
Merge pull request #9733 from ATM-Marc/FIX_6.0_propal_customcode 
FIX: propal pdf: missing parenthesis for customs code
 2018-10-12 21:14:40 +02:00
Laurent Destailleur
b78932b9f7 Prepare 7.0.5 2018-10-12 21:11:40 +02:00
Laurent Destailleur
d8edb1f6b8 Fix regression in online payment 2018-10-12 20:28:26 +02:00
Laurent Destailleur
83642ffa4d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-12 20:19:51 +02:00
Laurent Destailleur
067b29c9f8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-12 19:09:45 +02:00
Laurent Destailleur
9f27dd41e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2018-10-12 19:08:06 +02:00
Laurent Destailleur
d4b02c0552 Release 6.0.8 2018-10-12 19:03:03 +02:00
Laurent Destailleur
2d2b9a030c Fix app name to match Stripe advice 2018-10-12 19:01:01 +02:00
Laurent Destailleur
60a5444c14 Fix app name to match Stripe advice 2018-10-12 18:50:33 +02:00
Marc de Lima Lucio
afd9b4ea1a FIX: propal pdf: missing parenthesis for customs code 2018-10-12 18:19:17 +02:00
Laurent Destailleur
a2aa491c51
Merge pull request #9728 from atm-john/8.0_Fix_count_error 
Fix count on no countable object
 2018-10-12 17:52:30 +02:00
Laurent Destailleur
1ab6cd4b59
Update card.php 2018-10-12 17:51:32 +02:00