lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,692 Commits 43 Branches 150 Tags 886 MiB
5daf095fc6
Commit Graph

61772 Commits

Author SHA1 Message Date
Frédéric FRANCE
f169ec9259
Update ajaxdirtree.php 2018-10-21 10:37:49 +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
ias-ceo
cce2e2414f missing simicolon 2018-10-21 07:41:40 +03:00
Frédéric FRANCE
5f6cbda5a6
Update facture.class.php 2018-10-20 22:34:00 +02:00
Frédéric FRANCE
fbc5ce623e
payments 2018-10-20 17:17:21 +02:00
Frédéric FRANCE
02954931d8
Update thirdparty_lettrage_supplier.php 2018-10-20 16:27:15 +02:00
Frédéric FRANCE
d3022413ef
Update thirdparty_lettrage.php 2018-10-20 16:25:57 +02:00
Frédéric FRANCE
fab10acc15
change class name from lettering to Lettering 2018-10-20 16:23:43 +02:00
Frédéric FRANCE
4d72cafa52
code comment 2018-10-20 13:47:51 +02:00
Frédéric FRANCE
550dc622ca
code comment 2018-10-20 13:40:40 +02:00
Alexandre SPANGARO
a7de7013a1 Update code 2018-10-20 11:20:53 +02:00
Alexandre SPANGARO
921757c4a3 Fix travis 2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465 Debug Lettering 2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-20 06:35:39 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php 2018-10-19 22:52:18 +02:00
Frédéric FRANCE
042118fe38
fix it 2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371
fix new pdf 2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files 
Experimental new pdf documents  using new column system
 2018-10-19 15:51:54 +02:00
Laurent Destailleur
4571210bcf Fix remove deprecated field 2018-10-19 15:45:56 +02:00
Laurent Destailleur
897a2b09a7 Removed scrutinizer warning 2018-10-19 15:02:54 +02:00
Laurent Destailleur
b32ffdbbb9 Clean code 2018-10-19 14:59:00 +02:00
Laurent Destailleur
0408d123ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:46:39 +02:00
Laurent Destailleur
e4b5cc154e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:46:32 +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
5a228bf394
Merge pull request #9786 from aspangaro/9.0_accountancy2 
Fix FEC on accountancy movement card
 2018-10-19 14:33:46 +02:00
Laurent Destailleur
4e82a6da46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +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
13171b0b55
Merge pull request #9781 from frederic34/patch-17 
do not trim int
 2018-10-19 14:18:32 +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
Laurent Destailleur
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type 
NEW Add configuration to disable "customer/prospect" thirdparty type
 2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965
Update admin.lang 2018-10-19 13:47:18 +02:00
Laurent Destailleur
b6cb16a457
Merge pull request #9783 from frederic34/patch-18 
Update menubase.class.php
 2018-10-19 13:44:11 +02:00
Laurent Destailleur
86216960d4
Merge pull request #9785 from ptibogxiv/patch-81 
NEW ADD civility list in API
 2018-10-19 13:41:20 +02:00
Laurent Destailleur
078654b114
Merge pull request #9782 from ptibogxiv/patch-79 
FIX uniformization dates of order in API
 2018-10-19 13:39:10 +02:00
Laurent Destailleur
5f309bf155
Update commande.class.php 2018-10-19 13:38:23 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
Laurent Destailleur
cff2b923f9
Merge pull request #9784 from ptibogxiv/patch-80 
FIX harmony in date name with API
 2018-10-19 13:29:59 +02:00
Laurent Destailleur
5a9f0cbff7
Merge pull request #9796 from frederic34/patch-21 
do not trim int
 2018-10-19 13:26:08 +02:00
Laurent Destailleur
ee4f6602cc
Merge pull request #9795 from frederic34/patch-20 
do not trim int
 2018-10-19 13:25:39 +02:00
Laurent Destailleur
b12769e5c1
Merge pull request #9803 from simnandez/develop 
NEW Child label of variants change if parent label changes
 2018-10-19 13:23:35 +02:00
Laurent Destailleur
8a88b66c9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 13:18:28 +02:00
Laurent Destailleur
932a993b86
Merge pull request #9810 from andreubisquerra/master 
Fix delete without any selected line on takepos
 2018-10-19 13:18:07 +02:00
Laurent Destailleur
c13e555d5f
Merge pull request #9811 from frederic34/patch-24 
use strict comparaison
 2018-10-19 13:17:24 +02:00
Laurent Destailleur
24ae38abcc
Merge pull request #9797 from frederic34/patch-22 
do not trim int
 2018-10-19 13:03:03 +02:00
Laurent Destailleur
8af16609ca
Merge pull request #9779 from frederic34/patch-15 
Update html.formmail.class.php
 2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9
Merge pull request #9778 from frederic34/patch-9 
add errors def to form class
 2018-10-19 13:01:31 +02:00
Laurent Destailleur
0e33f18a3a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 12:58:31 +02:00
Laurent Destailleur
d086a71104
Merge pull request #9780 from frederic34/patch-16 
fix phpunit
 2018-10-19 12:58:15 +02:00
Laurent Destailleur
c01e6591ed
Merge pull request #9798 from frederic34/patch-23 
code comment
 2018-10-19 12:57:25 +02:00
Laurent Destailleur
c4e67de5c9
Merge pull request #9814 from Mavyre/patch-2 
Fixed all resources displaying on add in projects, events...
 2018-10-19 12:57:07 +02:00
Laurent Destailleur
b6e333876e FIX #9813 2018-10-19 12:56:21 +02:00
Laurent Destailleur
44e0bc9aed
Merge pull request #9812 from frederic34/docodt 
add log and comment
 2018-10-19 12:53:54 +02:00
Laurent Destailleur
9eed87da8e
Merge pull request #9794 from frederic34/patch-19 
do not trim int
 2018-10-19 12:51:26 +02:00
Laurent Destailleur
4bdde9ad56
Update ticketlogs.class.php 2018-10-19 12:51:14 +02:00
Laurent Destailleur
696023c1aa NEW Enhancement in the generic file manager 2018-10-19 12:47:59 +02:00
Juanjo Menent
34118bcf20 New: works with variants: 
- Multiprices compatibility
 2018-10-19 12:02:14 +02:00
Juanjo Menent
26dd738f3b Merge remote-tracking branch 'upstream/develop' into develop 2018-10-19 12:00:22 +02:00
Laurent Destailleur
985ab1efda FIX delete of a file in file_manager return to same dir 2018-10-19 10:59:34 +02:00
Juanjo Menent
1714bce8a1 New: works with variants: 
- Better function name
 2018-10-19 08:53:01 +02:00
Juanjo Menent
b57993e599 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-19 08:36:12 +02:00
Mavyre
32a3779d23
Fixed all ressources displaying 2018-10-18 22:08:23 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment 2018-10-18 21:47:10 +02:00
Frédéric FRANCE
b0e24e2b8d
use strict comparaison 2018-10-18 21:24:06 +02:00
Laurent Destailleur
d4bc53660b Code comment and debug filemanager 2018-10-18 21:22:30 +02:00
Frédéric FRANCE
256ee40d0a
Merge remote-tracking branch 'upstream/develop' into patch-16 2018-10-18 21:01:49 +02:00
Frédéric FRANCE
7012b7829f
Merge remote-tracking branch 'upstream/develop' into patch-23 2018-10-18 20:51:39 +02:00
Frédéric FRANCE
c4cc58443a
Merge remote-tracking branch 'upstream/develop' into patch-22 2018-10-18 20:50:03 +02:00
Frédéric FRANCE
5a9e49ef46
Merge remote-tracking branch 'upstream/develop' into patch-21 2018-10-18 20:48:01 +02:00
Frédéric FRANCE
69d3b274aa
Merge remote-tracking branch 'upstream/develop' into patch-20 2018-10-18 20:46:47 +02:00
Frédéric FRANCE
8dd7f62a77
Merge remote-tracking branch 'upstream/develop' into patch-19 2018-10-18 20:45:36 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15 2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9 2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914
Merge remote-tracking branch 'upstream/develop' into patch-18 2018-10-18 20:39:45 +02:00
Frédéric FRANCE
16211473d7
Merge remote-tracking branch 'upstream/develop' into patch-17 2018-10-18 20:36:43 +02:00
Laurent Destailleur
66cb06eca9 NEW Top menu is always on screen with MD theme. 2018-10-18 17:33:14 +02:00
Laurent Destailleur
05326e271d FIX Filter on invoice type 2018-10-18 17:15:26 +02:00
Laurent Destailleur
7cafdc4d9a Fix phpcs 2018-10-18 16:56:43 +02:00
andreubisquerra
b396aaebc5 Fix delete without any selected line 2018-10-18 16:31:37 +02:00
Juanjo Menent
52ad5c5565 New: works with variants: 
-To edit child price and weight impacts better to see in tab the father price and weight
 2018-10-18 12:21:39 +02:00
Juanjo Menent
c588f5e6c0 New: works with variants: 
-Child label with combination labels
 2018-10-18 10:55:27 +02:00
Juanjo Menent
6c76f9517f New: works with variants: 
-Child label with combination labels
 2018-10-18 10:26:21 +02:00
Juanjo Menent
fd989230a4 New: works with variants: 
-Child label change if parent changes
 2018-10-18 09:09:42 +02:00
Laurent Destailleur
548fafc6e9 Fix trans 2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a Fix trans 2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725 Fix translation 2018-10-18 01:05:10 +02:00
Laurent Destailleur
52840478c0 Clean code 2018-10-17 21:11:07 +02:00
Frédéric FRANCE
db732ddedd
code comment 2018-10-17 20:36:45 +02:00
Frédéric FRANCE
ebc5cb5a96
do not trim int 2018-10-17 20:24:43 +02:00
Frédéric FRANCE
393303fe31
do not trim int 2018-10-17 20:17:43 +02:00
Frédéric FRANCE
47048baa36
do not trim int 2018-10-17 20:14:01 +02:00
Frédéric FRANCE
456bdb5b8c
do not trim int 2018-10-17 20:04:48 +02:00
atm-greg
d86c44e641 Add conf to disable a thirdparty type 2018-10-17 15:55:46 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
a66256a799 FIX Hover on the filemanager 2018-10-17 13:22:52 +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
Frédéric FRANCE
7d8ff04292
Update paiement.class.php 2018-10-17 08:15:12 +02:00
Alexandre SPANGARO
a466104b81 Fix FEC on transaction card 
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
 2018-10-17 07:20:04 +02:00
Alexandre SPANGARO
e614d33aa4 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-17 05:57:22 +02:00
ptibogxiv
f2d0004a3e
ADD civility list in API 2018-10-17 00:36:40 +02:00
Laurent Destailleur
3ef32a24a4 Look and feel 2018-10-17 00:34:39 +02:00
ptibogxiv
a77458cb36
Update facture.class.php 2018-10-17 00:07:21 +02:00
ptibogxiv
7c35eae202
Update commande.class.php 2018-10-17 00:06:24 +02:00
ptibogxiv
3fdf3c95b4
FIX harmony in date name with API 2018-10-17 00:04:44 +02:00
Frédéric FRANCE
70b6c502da
Update menubase.class.php 2018-10-16 23:36:00 +02:00
ptibogxiv
27b7cf8bea
Fix uniformization dates of order in API 2018-10-16 23:31:19 +02:00
Frédéric FRANCE
fa78ab7c66
do not trim int 2018-10-16 23:20:13 +02:00
Frédéric FRANCE
2e77b9fed9
fix phpunit 2018-10-16 22:42:18 +02:00
Frédéric FRANCE
cf1819ea0e
Update html.formmail.class.php 2018-10-16 22:27:34 +02:00
Alexandre SPANGARO
a5ebcff2ee Fix lettering function 2018-10-16 22:27:34 +02:00
Frédéric FRANCE
2d542d028f
Update html.formmail.class.php 2018-10-16 22:22:57 +02:00
Frédéric FRANCE
4e14c2817c
add errors def to form class 2018-10-16 22:09:11 +02:00
Laurent Destailleur
00dc78dd01 Fix responsive 2018-10-16 21:58:33 +02:00
Frédéric FRANCE
f80de9e65e
fix syntax error and phpcs 2018-10-16 21:49:26 +02:00
Laurent Destailleur
74c74f9e2d
Merge pull request #9776 from ptibogxiv/patch-78 
FIX call of bankaccount class
 2018-10-16 21:43:51 +02:00
Laurent Destailleur
2ce1aaaebf
Update api_thirdparties.class.php 2018-10-16 21:43:40 +02:00
Laurent Destailleur
6a3597d9fd
Merge pull request #9774 from frederic34/datapolicy 
cut long lines >500 to remove phpcs warning
 2018-10-16 21:42:36 +02:00
Laurent Destailleur
e418090053
Merge pull request #9775 from aspangaro/9.0_accountancy 
Fix FEC Missing some information in bookkeeping
 2018-10-16 21:41:52 +02:00
Laurent Destailleur
192168cfa4
Merge pull request #9773 from ptibogxiv/patch-77 
Delete dictionary in ticket API
 2018-10-16 21:40:24 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76 
NEW move ticket dictionary in API /setup
 2018-10-16 21:39:30 +02:00
Laurent Destailleur
737bbf6e7c
Update api_setup.class.php 2018-10-16 21:38:27 +02:00
ptibogxiv
5e20390e15
FIX call of bankaccount class 2018-10-16 21:33:42 +02:00
Alexandre SPANGARO
eb4ffcf1a7 Fix FEC Missing some information in bookkeeping 2018-10-16 21:17:00 +02:00
Frédéric FRANCE
e2a6c9e332
cut long lines >500 2018-10-16 21:05:15 +02:00
ptibogxiv
0e6d3a0f48
FIX delete dictionnary in ticket API 2018-10-16 20:59:06 +02:00
ptibogxiv
c9aaf01a7c
MOVE ticket dictionnary in API /setup 2018-10-16 20:56:10 +02:00
Laurent Destailleur
58240c8f1c
Merge pull request #9767 from ptibogxiv/patch-74 
NEW Save external payment IDs into table of payment
 2018-10-16 20:32:23 +02:00
Laurent Destailleur
8d815c4e6b
Merge pull request #9766 from ptibogxiv/patch-73 
ADD support of external modepayment
 2018-10-16 20:30:24 +02:00
Laurent Destailleur
9959ba3662
Merge pull request #9761 from frederic34/patch-20 
Update actioncomm.class.php
 2018-10-16 20:29:15 +02:00
Laurent Destailleur
0ecf7986f8
Merge pull request #9771 from frederic34/patch-9 
fix phpcs
 2018-10-16 20:28:12 +02:00
Laurent Destailleur
57bb8bcfcd Disabled action are hidden with reason 2018-10-16 20:27:33 +02:00
Frédéric FRANCE
a40271e475
Update bankjournal.php 2018-10-16 20:11:32 +02:00
Frédéric FRANCE
f470068d9d
fix phpcs 2018-10-16 20:10:13 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop 
New: works with variants
 2018-10-16 20:08:17 +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
f07096ea3a
Merge pull request #9760 from frederic34/patch-19 
add errors def in htmlformsms
 2018-10-16 20:01:41 +02:00
Laurent Destailleur
44d8333633 Fix external link must be after label 2018-10-16 20:00:53 +02:00
Laurent Destailleur
97273ff746
Merge pull request #9768 from ptibogxiv/patch-75 
Add source link in stripe
 2018-10-16 19:50:11 +02:00
Laurent Destailleur
78d7ea459d
Update paymentmodes.php 2018-10-16 19:49:16 +02:00
Laurent Destailleur
eaa759fd68
Merge pull request #9759 from frederic34/patch-15 
add errors def in mailman class
 2018-10-16 19:46:42 +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